Skip to content
Snippets Groups Projects
Commit 9120a9bf authored by Leyla Farazha's avatar Leyla Farazha
Browse files

merge

parents 950b74c1 59f8a2e7
No related branches found
No related tags found
No related merge requests found
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
mouse_opaque="false" mouse_opaque="false"
name="chat_bar_layout_panel" name="chat_bar_layout_panel"
user_resize="true" user_resize="true"
width="250" > width="310" >
<panel <panel
name="chat_bar" name="chat_bar"
filename="panel_nearby_chat_bar.xml" filename="panel_nearby_chat_bar.xml"
left="0" left="0"
height="28" height="28"
width="248" width="308"
top="0" top="0"
mouse_opaque="false" mouse_opaque="false"
follows="left|right" follows="left|right"
...@@ -341,7 +341,7 @@ Disabled for now. ...@@ -341,7 +341,7 @@ Disabled for now.
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="62" min_width="52"
mouse_opaque="false" mouse_opaque="false"
name="mini_map_btn_panel" name="mini_map_btn_panel"
user_resize="false" user_resize="false"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment