From 473c9f4692e274448d4bc5c537c8ccb6ed8280b0 Mon Sep 17 00:00:00 2001 From: xiangwang Date: Wed, 11 Mar 2026 00:50:43 +0800 Subject: [PATCH] Revert "ui: update auth scene layout" This reverts commit 9d5536fd327d6c9c8c09d74675f755ad350450ff. --- scenes/ui/AuthScene.tscn | 57 ++++------------------------------------ 1 file changed, 5 insertions(+), 52 deletions(-) diff --git a/scenes/ui/AuthScene.tscn b/scenes/ui/AuthScene.tscn index 5d5fc9f..8e81345 100644 --- a/scenes/ui/AuthScene.tscn +++ b/scenes/ui/AuthScene.tscn @@ -9,10 +9,6 @@ [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_cjyup"] texture = ExtResource("4_lnw07") -content_margin_left = 16.0 -content_margin_right = 16.0 -content_margin_top = 10.0 -content_margin_bottom = 10.0 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_hover"] bg_color = Color(0.3, 0.6, 0.9, 1) @@ -134,9 +130,9 @@ anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 offset_left = -140.0 -offset_top = -205.5 +offset_top = -185.5 offset_right = 140.0 -offset_bottom = 165.5 +offset_bottom = 185.5 grow_horizontal = 2 grow_vertical = 2 @@ -164,10 +160,6 @@ layout_mode = 2 layout_mode = 2 size_flags_vertical = 3 -[node name="TopPadding" type="Control" parent="CenterContainer/LoginPanel/VBoxContainer/LoginForm"] -custom_minimum_size = Vector2(0, 8) -layout_mode = 2 - [node name="UsernameContainer" type="VBoxContainer" parent="CenterContainer/LoginPanel/VBoxContainer/LoginForm"] layout_mode = 2 @@ -203,8 +195,6 @@ theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_colors/font_placeholder_color = Color(0.5, 0.5, 0.5, 1) theme_override_colors/selection_color = Color(0.5, 0.5, 0.5, 1) theme_override_styles/normal = SubResource("StyleBoxTexture_cjyup") -theme_override_styles/focus = SubResource("StyleBoxTexture_cjyup") -theme_override_font_sizes/font_size = 16 placeholder_text = "用户名/手机/邮箱" [node name="PasswordContainer" type="VBoxContainer" parent="CenterContainer/LoginPanel/VBoxContainer/LoginForm"] @@ -236,13 +226,9 @@ text = "密码不能为空" horizontal_alignment = 2 [node name="PasswordInput" type="LineEdit" parent="CenterContainer/LoginPanel/VBoxContainer/LoginForm/PasswordContainer"] -custom_minimum_size = Vector2(0, 48) layout_mode = 2 theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_colors/font_placeholder_color = Color(0.5, 0.5, 0.5, 1) -theme_override_styles/normal = SubResource("StyleBoxTexture_cjyup") -theme_override_styles/focus = SubResource("StyleBoxTexture_cjyup") -theme_override_font_sizes/font_size = 16 placeholder_text = "请输入密码" secret = true @@ -279,14 +265,10 @@ horizontal_alignment = 2 layout_mode = 2 [node name="VerificationInput" type="LineEdit" parent="CenterContainer/LoginPanel/VBoxContainer/LoginForm/VerificationContainer/VerificationInputContainer"] -custom_minimum_size = Vector2(0, 48) layout_mode = 2 size_flags_horizontal = 3 theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_colors/font_placeholder_color = Color(0.5, 0.5, 0.5, 1) -theme_override_styles/normal = SubResource("StyleBoxTexture_cjyup") -theme_override_styles/focus = SubResource("StyleBoxTexture_cjyup") -theme_override_font_sizes/font_size = 16 placeholder_text = "请输入6位验证码" max_length = 6 @@ -332,25 +314,16 @@ text = "密码登录" [node name="BottomLinks" type="HBoxContainer" parent="CenterContainer/LoginPanel/VBoxContainer"] layout_mode = 2 alignment = 1 -theme_override_constants/separation = 16 [node name="ForgotPassword" type="Button" parent="CenterContainer/LoginPanel/VBoxContainer/BottomLinks"] -custom_minimum_size = Vector2(0, 28) layout_mode = 2 -theme_override_colors/font_color = Color(0.12, 0.4, 0.7, 1) -theme_override_colors/font_hover_color = Color(0.2, 0.5, 0.8, 1) -theme_override_colors/font_pressed_color = Color(0.1, 0.35, 0.6, 1) -theme_override_font_sizes/font_size = 14 -text = "忘记密码？" +theme_override_colors/font_color = Color(0, 0, 0, 1) +text = "忘记密码?" flat = true [node name="RegisterLink" type="Button" parent="CenterContainer/LoginPanel/VBoxContainer/BottomLinks"] -custom_minimum_size = Vector2(0, 28) layout_mode = 2 -theme_override_colors/font_color = Color(0.12, 0.4, 0.7, 1) -theme_override_colors/font_hover_color = Color(0.2, 0.5, 0.8, 1) -theme_override_colors/font_pressed_color = Color(0.1, 0.35, 0.6, 1) -theme_override_font_sizes/font_size = 14 +theme_override_colors/font_color = Color(0, 0, 0, 1) text = "注册居民身份" flat = true @@ -418,13 +391,9 @@ text = "用户名不能为空" horizontal_alignment = 2 [node name="UsernameInput" type="LineEdit" parent="CenterContainer/RegisterPanel/VBoxContainer/RegisterForm/UsernameContainer"] -custom_minimum_size = Vector2(0, 48) layout_mode = 2 theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_colors/font_placeholder_color = Color(0.5, 0.5, 0.5, 1) -theme_override_styles/normal = SubResource("StyleBoxTexture_cjyup") -theme_override_styles/focus = SubResource("StyleBoxTexture_cjyup") -theme_override_font_sizes/font_size = 16 placeholder_text = "请输入用户名" [node name="EmailContainer" type="VBoxContainer" parent="CenterContainer/RegisterPanel/VBoxContainer/RegisterForm"] @@ -456,13 +425,9 @@ text = "邮箱不能为空" horizontal_alignment = 2 [node name="EmailInput" type="LineEdit" parent="CenterContainer/RegisterPanel/VBoxContainer/RegisterForm/EmailContainer"] -custom_minimum_size = Vector2(0, 48) layout_mode = 2 theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_colors/font_placeholder_color = Color(0.5, 0.5, 0.5, 1) -theme_override_styles/normal = SubResource("StyleBoxTexture_cjyup") -theme_override_styles/focus = SubResource("StyleBoxTexture_cjyup") -theme_override_font_sizes/font_size = 16 placeholder_text = "请输入邮箱地址" [node name="PasswordContainer" type="VBoxContainer" parent="CenterContainer/RegisterPanel/VBoxContainer/RegisterForm"] @@ -494,13 +459,9 @@ text = "密码不能为空" horizontal_alignment = 2 [node name="PasswordInput" type="LineEdit" parent="CenterContainer/RegisterPanel/VBoxContainer/RegisterForm/PasswordContainer"] -custom_minimum_size = Vector2(0, 48) layout_mode = 2 theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_colors/font_placeholder_color = Color(0.5, 0.5, 0.5, 1) -theme_override_styles/normal = SubResource("StyleBoxTexture_cjyup") -theme_override_styles/focus = SubResource("StyleBoxTexture_cjyup") -theme_override_font_sizes/font_size = 16 placeholder_text = "请输入密码(至少8位)" secret = true @@ -533,13 +494,9 @@ text = "确认密码不能为空" horizontal_alignment = 2 [node name="ConfirmInput" type="LineEdit" parent="CenterContainer/RegisterPanel/VBoxContainer/RegisterForm/ConfirmContainer"] -custom_minimum_size = Vector2(0, 48) layout_mode = 2 theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_colors/font_placeholder_color = Color(0.5, 0.5, 0.5, 1) -theme_override_styles/normal = SubResource("StyleBoxTexture_cjyup") -theme_override_styles/focus = SubResource("StyleBoxTexture_cjyup") -theme_override_font_sizes/font_size = 16 placeholder_text = "请再次输入密码" secret = true @@ -575,14 +532,10 @@ horizontal_alignment = 2 layout_mode = 2 [node name="VerificationInput" type="LineEdit" parent="CenterContainer/RegisterPanel/VBoxContainer/RegisterForm/VerificationContainer/VerificationInputContainer"] -custom_minimum_size = Vector2(0, 48) layout_mode = 2 size_flags_horizontal = 3 theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_colors/font_placeholder_color = Color(0.5, 0.5, 0.5, 1) -theme_override_styles/normal = SubResource("StyleBoxTexture_cjyup") -theme_override_styles/focus = SubResource("StyleBoxTexture_cjyup") -theme_override_font_sizes/font_size = 16 placeholder_text = "请输入6位验证码" max_length = 6