Skip to content

Commit 9578fb2

Browse files
committed
fix themes from rebase
1 parent a82a0c6 commit 9578fb2

2 files changed

Lines changed: 32 additions & 22 deletions

File tree

material_maker/theme/classic_base.tres

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_resource type="Theme" load_steps=148 format=3 uid="uid://w487nirev8y5"]
1+
[gd_resource type="Theme" load_steps=150 format=3 uid="uid://w487nirev8y5"]
22

33
[ext_resource type="Texture2D" uid="uid://1s0c37uoj4rf" path="res://material_maker/theme/default_theme_icons.svg" id="1_fw8f4"]
44
[ext_resource type="FontFile" uid="uid://lro0qdrhfytt" path="res://material_maker/theme/font_rubik/Rubik-Light.ttf" id="3_h5b0q"]
@@ -613,22 +613,32 @@ corner_detail = 4
613613
content_margin_top = 3.0
614614

615615
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_a74kv"]
616-
bg_color = Color(0.3137255, 0.3137255, 0.34901962, 1)
617-
corner_radius_top_left = 11
618-
corner_radius_top_right = 11
619-
corner_radius_bottom_right = 11
620-
corner_radius_bottom_left = 11
616+
bg_color = Color(0.19685599, 0.22558257, 0.2973433, 1)
617+
corner_radius_top_left = 4
618+
corner_radius_top_right = 4
619+
corner_radius_bottom_right = 4
620+
corner_radius_bottom_left = 4
621+
corner_detail = 4
622+
expand_margin_left = 4.0
623+
expand_margin_top = 35.0
624+
expand_margin_right = 4.0
625+
expand_margin_bottom = 4.0
626+
shadow_color = Color(0, 0, 0, 0.2)
627+
shadow_size = 8
621628

622629
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_nmkov"]
623-
bg_color = Color(0.42352942, 0.42352942, 0.4627451, 1)
624-
border_width_left = 2
625-
border_width_top = 2
626-
border_width_right = 2
627-
border_width_bottom = 2
628-
corner_radius_top_left = 11
629-
corner_radius_top_right = 11
630-
corner_radius_bottom_right = 11
631-
corner_radius_bottom_left = 11
630+
bg_color = Color(0.1525, 0.18175, 0.25, 1)
631+
corner_radius_top_left = 4
632+
corner_radius_top_right = 4
633+
corner_radius_bottom_right = 4
634+
corner_radius_bottom_left = 4
635+
corner_detail = 4
636+
expand_margin_left = 4.0
637+
expand_margin_top = 35.0
638+
expand_margin_right = 4.0
639+
expand_margin_bottom = 4.0
640+
shadow_color = Color(0, 0, 0, 0.2)
641+
shadow_size = 8
632642

633643
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ppdpb"]
634644

@@ -906,7 +916,7 @@ border_width_left = 4
906916
border_width_right = 4
907917
border_color = Color(0, 0, 0, 0.11764706)
908918

909-
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_a74kv"]
919+
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ppdpb"]
910920
bg_color = Color(0.19685599, 0.22558257, 0.2973433, 1)
911921
corner_radius_top_left = 4
912922
corner_radius_top_right = 4
@@ -920,7 +930,7 @@ expand_margin_bottom = 4.0
920930
shadow_color = Color(0, 0, 0, 0.2)
921931
shadow_size = 8
922932

923-
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_nmkov"]
933+
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_btb0w"]
924934
bg_color = Color(0.1525, 0.18175, 0.25, 1)
925935
corner_radius_top_left = 4
926936
corner_radius_top_right = 4
@@ -1197,5 +1207,5 @@ VScrollBar/styles/grabber = SubResource("StyleBoxFlat_fw8f4")
11971207
VScrollBar/styles/grabber_highlight = SubResource("StyleBoxFlat_wbe58")
11981208
VScrollBar/styles/grabber_pressed = SubResource("StyleBoxFlat_wbe58")
11991209
VScrollBar/styles/scroll = SubResource("StyleBoxFlat_ropwn")
1200-
Window/styles/embedded_border = SubResource("StyleBoxFlat_a74kv")
1201-
Window/styles/embedded_unfocused_border = SubResource("StyleBoxFlat_nmkov")
1210+
Window/styles/embedded_border = SubResource("StyleBoxFlat_ppdpb")
1211+
Window/styles/embedded_unfocused_border = SubResource("StyleBoxFlat_btb0w")

material_maker/theme/default.tres

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_resource type="Theme" load_steps=171 format=3 uid="uid://b628lwfk6ig2c"]
1+
[gd_resource type="Theme" load_steps=173 format=3 uid="uid://b628lwfk6ig2c"]
22

33
[ext_resource type="FontFile" uid="uid://lro0qdrhfytt" path="res://material_maker/theme/font_rubik/Rubik-Light.ttf" id="1_5tfb1"]
44
[ext_resource type="Texture2D" uid="uid://1s0c37uoj4rf" path="res://material_maker/theme/default_theme_icons.svg" id="1_s43fy"]
@@ -1152,7 +1152,7 @@ expand_margin_bottom = 4.0
11521152
shadow_color = Color(0, 0, 0, 0.2)
11531153
shadow_size = 8
11541154

1155-
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8uenv"]
1155+
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ld0tj"]
11561156
bg_color = Color(0.1764706, 0.18039216, 0.19607843, 1)
11571157
corner_radius_top_left = 4
11581158
corner_radius_top_right = 4
@@ -1496,4 +1496,4 @@ VScrollBar/styles/grabber_highlight = SubResource("StyleBoxFlat_70aex")
14961496
VScrollBar/styles/grabber_pressed = SubResource("StyleBoxFlat_70aex")
14971497
VScrollBar/styles/scroll = SubResource("StyleBoxFlat_w0re2")
14981498
Window/styles/embedded_border = SubResource("StyleBoxFlat_08mel")
1499-
Window/styles/embedded_unfocused_border = SubResource("StyleBoxFlat_8uenv")
1499+
Window/styles/embedded_unfocused_border = SubResource("StyleBoxFlat_ld0tj")

0 commit comments

Comments
 (0)