diff --git a/game/app/scenes/game_card.tscn b/game/app/scenes/game_card.tscn index cdff4e9f..224af0bd 100644 --- a/game/app/scenes/game_card.tscn +++ b/game/app/scenes/game_card.tscn @@ -49,10 +49,13 @@ bg_color = Color( 0.164706, 0.164706, 0.164706, 1 ) [node name="GameCard" type="ColorRect"] margin_right = 320.0 margin_bottom = 180.0 -rect_min_size = Vector2( 320, 180 ) +rect_min_size = Vector2( 320, 187 ) theme = ExtResource( 7 ) color = Color( 0.2, 0.2, 0.2, 1 ) script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="BackgroundImage" type="TextureRect" parent="."] visible = false diff --git a/game/app/scenes/menu.tscn b/game/app/scenes/menu.tscn index 948dc3f7..73560ef3 100644 --- a/game/app/scenes/menu.tscn +++ b/game/app/scenes/menu.tscn @@ -30,6 +30,9 @@ anchor_bottom = 1.0 theme = ExtResource( 3 ) custom_constants/separation = 0 script = ExtResource( 5 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="MenuBar" type="PanelContainer" parent="."] margin_right = 1024.0 diff --git a/game/app/style/main_theme.tres b/game/app/style/main_theme.tres index 337c12a1..2185d4e3 100644 --- a/game/app/style/main_theme.tres +++ b/game/app/style/main_theme.tres @@ -74,10 +74,10 @@ corner_radius_bottom_left = 18 [sub_resource type="StyleBoxFlat" id=41] bg_color = Color( 0.368627, 0.368627, 0.368627, 1 ) -corner_radius_top_left = 10 -corner_radius_top_right = 10 -corner_radius_bottom_right = 10 -corner_radius_bottom_left = 10 +corner_radius_top_left = 12 +corner_radius_top_right = 12 +corner_radius_bottom_right = 12 +corner_radius_bottom_left = 12 [sub_resource type="StyleBoxFlat" id=40] content_margin_left = 5.0 @@ -86,10 +86,13 @@ content_margin_top = 5.0 content_margin_bottom = 0.0 bg_color = Color( 0.243137, 0.243137, 0.243137, 1 ) border_color = Color( 0, 0, 0, 1 ) -corner_radius_top_left = 10 -corner_radius_top_right = 10 -corner_radius_bottom_right = 10 -corner_radius_bottom_left = 10 +corner_radius_top_left = 14 +corner_radius_top_right = 14 +corner_radius_bottom_right = 14 +corner_radius_bottom_left = 14 +expand_margin_left = 2.0 +expand_margin_right = 2.0 +expand_margin_bottom = 5.0 shadow_offset = Vector2( 5, 5 ) [sub_resource type="StyleBoxFlat" id=35] diff --git a/game/app/style/round_icon_button_theme.tres b/game/app/style/round_icon_button_theme.tres index bb758143..c681eff3 100644 --- a/game/app/style/round_icon_button_theme.tres +++ b/game/app/style/round_icon_button_theme.tres @@ -9,10 +9,10 @@ border_width_top = 1 border_width_right = 1 border_width_bottom = 1 border_color = Color( 0, 0, 0, 0 ) -corner_radius_top_left = 18 -corner_radius_top_right = 18 -corner_radius_bottom_right = 18 -corner_radius_bottom_left = 18 +corner_radius_top_left = 21 +corner_radius_top_right = 21 +corner_radius_bottom_right = 21 +corner_radius_bottom_left = 21 [sub_resource type="StyleBoxFlat" id=25] bg_color = Color( 0, 0, 0, 0 ) @@ -22,22 +22,22 @@ border_width_right = 2 border_width_bottom = 3 border_color = Color( 0.25098, 0.627451, 1, 1 ) border_blend = true -corner_radius_top_left = 18 -corner_radius_top_right = 18 -corner_radius_bottom_right = 18 -corner_radius_bottom_left = 18 +corner_radius_top_left = 21 +corner_radius_top_right = 21 +corner_radius_bottom_right = 21 +corner_radius_bottom_left = 21 [sub_resource type="StyleBoxFlat" id=26] -bg_color = Color( 1, 1, 1, 0.12549 ) +bg_color = Color( 0.333333, 0.333333, 0.333333, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 border_width_bottom = 1 border_color = Color( 1, 1, 1, 0.501961 ) -corner_radius_top_left = 18 -corner_radius_top_right = 18 -corner_radius_bottom_right = 18 -corner_radius_bottom_left = 18 +corner_radius_top_left = 21 +corner_radius_top_right = 21 +corner_radius_bottom_right = 21 +corner_radius_bottom_left = 21 [sub_resource type="StyleBoxFlat" id=23] bg_color = Color( 0.266667, 0.266667, 0.266667, 1 ) @@ -46,10 +46,10 @@ border_width_top = 1 border_width_right = 1 border_width_bottom = 1 border_color = Color( 0, 0, 0, 0 ) -corner_radius_top_left = 18 -corner_radius_top_right = 18 -corner_radius_bottom_right = 18 -corner_radius_bottom_left = 18 +corner_radius_top_left = 21 +corner_radius_top_right = 21 +corner_radius_bottom_right = 21 +corner_radius_bottom_left = 21 [sub_resource type="StyleBoxFlat" id=27] bg_color = Color( 0, 0, 0, 0.12549 ) @@ -58,10 +58,10 @@ border_width_top = 1 border_width_right = 1 border_width_bottom = 1 border_color = Color( 0, 0, 0, 0 ) -corner_radius_top_left = 18 -corner_radius_top_right = 18 -corner_radius_bottom_right = 18 -corner_radius_bottom_left = 18 +corner_radius_top_left = 21 +corner_radius_top_right = 21 +corner_radius_bottom_right = 21 +corner_radius_bottom_left = 21 [sub_resource type="DynamicFont" id=21] font_data = ExtResource( 1 ) diff --git a/game/project.godot b/game/project.godot index fc9bde61..eec56201 100644 --- a/game/project.godot +++ b/game/project.godot @@ -24,7 +24,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://games/sortit/player.gd" }, { -"base": "Reference", +"base": "MarginContainer", "class": "SortItRoot", "language": "GDScript", "path": "res://games/sortit/sort_it.gd"