From 52479fec2f82ec55326bec826f01ea5148f1596f Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Sat, 25 Jul 2020 11:57:02 +0300
Subject: [PATCH] add title to server select menu, don't use unneeded Container
 in language select menu

---
 assets/voxygen/i18n/en.ron          |  2 ++
 voxygen/src/menu/main/ui/login.rs   |  6 +++---
 voxygen/src/menu/main/ui/servers.rs | 28 +++++++++++++++++-----------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron
index 6501b36463..fe67fe335d 100644
--- a/assets/voxygen/i18n/en.ron
+++ b/assets/voxygen/i18n/en.ron
@@ -160,6 +160,8 @@ https://veloren.net/account/."#,
         "main.login.banned": "You have been banned with the following reason",
         "main.login.kicked": "You have been kicked with the following reason",
 
+		"main.servers.select_server": "Select a server",
+
         /// End Main screen section
 
 
diff --git a/voxygen/src/menu/main/ui/login.rs b/voxygen/src/menu/main/ui/login.rs
index 44ff562128..f7039b400a 100644
--- a/voxygen/src/menu/main/ui/login.rs
+++ b/voxygen/src/menu/main/ui/login.rs
@@ -217,9 +217,9 @@ impl LanguageSelectBanner {
         selected_language_index: Option<usize>,
         button_style: style::button::Style,
     ) -> Element<Message> {
-        let title =
-            Container::new(Text::new(i18n.get("main.select_language")).size(fonts.cyri.scale(35)))
-                .center_x();
+        let title = Text::new(i18n.get("main.select_language"))
+            .size(fonts.cyri.scale(35))
+            .horizontal_alignment(iced::HorizontalAlignment::Center);
 
         let mut list = Scrollable::new(&mut self.selection_list)
             .spacing(8)
diff --git a/voxygen/src/menu/main/ui/servers.rs b/voxygen/src/menu/main/ui/servers.rs
index 5564c16cfa..7cf11cdf15 100644
--- a/voxygen/src/menu/main/ui/servers.rs
+++ b/voxygen/src/menu/main/ui/servers.rs
@@ -39,17 +39,23 @@ impl Screen {
         i18n: &Localization,
         button_style: style::button::Style,
     ) -> Element<Message> {
-        let button = neat_button(
-            &mut self.back_button,
-            i18n.get("common.back"),
-            0.77_f32,
-            button_style,
-            Some(Message::Back),
-        );
-
-        let button = Container::new(Container::new(button).max_width(200))
+        let title = Text::new(i18n.get("main.servers.select_server"))
+            .size(fonts.cyri.scale(35))
             .width(Length::Fill)
-            .align_x(Align::Center);
+            .horizontal_alignment(iced::HorizontalAlignment::Center);
+
+        let back_button = Container::new(
+            Container::new(neat_button(
+                &mut self.back_button,
+                i18n.get("common.back"),
+                0.77_f32,
+                button_style,
+                Some(Message::Back),
+            ))
+            .max_width(200),
+        )
+        .width(Length::Fill)
+        .align_x(Align::Center);
 
         let mut list = Scrollable::new(&mut self.servers_list)
             .spacing(8)
@@ -88,7 +94,7 @@ impl Screen {
 
         Container::new(
             Container::new(
-                Column::with_children(vec![list.into(), button.into()])
+                Column::with_children(vec![title.into(), list.into(), back_button.into()])
                     .width(Length::Fill)
                     .height(Length::Fill)
                     .spacing(10)