diff --git a/assets/voxygen/element/frames/banner.png b/assets/voxygen/element/frames/banner.png new file mode 100644 index 0000000000..076bef4d86 --- /dev/null +++ b/assets/voxygen/element/frames/banner.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4098a11c1913bbbe10b3919f907c9b76fcbb2492eab2bd3a9157d0d496e53c06 +size 221 diff --git a/assets/voxygen/element/frames/banner_bottom.png b/assets/voxygen/element/frames/banner_bottom.png new file mode 100644 index 0000000000..1aaeede080 --- /dev/null +++ b/assets/voxygen/element/frames/banner_bottom.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c17d4c8fa81bd73568b741c8fc2c92cfba5397273d659c576479af1a8861e129 +size 305 diff --git a/assets/voxygen/element/misc_bg/textbox_mid.png b/assets/voxygen/element/misc_bg/textbox_mid.png index 9c271c6c21..76e2f1ae6b 100644 --- a/assets/voxygen/element/misc_bg/textbox_mid.png +++ b/assets/voxygen/element/misc_bg/textbox_mid.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d9097face16955fac82b30dbe896796aea1b589db5c9cda2f87d9bc7f63f3a7 -size 6103 +oid sha256:f67d0de987b60ed50fea6b838df87aa0d23a846af0d8ece4f3b162136fc70a16 +size 1389 diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs index a9e66c4ec0..85c1f5525e 100644 --- a/voxygen/src/menu/main/ui.rs +++ b/voxygen/src/menu/main/ui.rs @@ -20,6 +20,8 @@ use conrod_core::{ use rand::{seq::SliceRandom, thread_rng}; use std::time::Duration; +const COL1: Color = Color::Rgba(0.07, 0.1, 0.1, 0.9); + // UI Color-Theme /*const UI_MAIN: Color = Color::Rgba(0.61, 0.70, 0.70, 1.0); // Greenish Blue const UI_HIGHLIGHT_0: Color = Color::Rgba(0.79, 1.09, 1.09, 1.0);*/ @@ -84,19 +86,19 @@ image_ids! { v_logo: "voxygen.element.v_logo", info_frame: "voxygen.element.frames.info_frame_2", - banner: "voxygen.element.frames.banner", - banner_bottom: "voxygen.element.frames.banner_bottom", + + bg: "voxygen.background.bg_main", banner_top: "voxygen.element.frames.banner_top", + banner: "voxygen.element.frames.banner", + banner_bottom: "voxygen.element.frames.banner_bottom", button: "voxygen.element.buttons.button", button_hover: "voxygen.element.buttons.button_hover", button_press: "voxygen.element.buttons.button_press", - input_bg_top: "voxygen.element.misc_bg.textbox_top", - input_bg_mid: "voxygen.element.misc_bg.textbox_mid", - input_bg_bot: "voxygen.element.misc_bg.textbox_bot", + input_bg: "voxygen.element.misc_bg.textbox_mid", disclaimer: "voxygen.element.frames.disclaimer", @@ -406,7 +408,7 @@ impl MainMenuUi { Image::new(self.imgs.banner) .w_h(65.0 * 6.0, 100.0 * 6.0) .middle_of(self.ids.bg) - .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.9))) + .color(Some(Color::Rgba(0.0, 0.0, 0.0, 0.9))) .set(self.ids.banner, ui_widgets); Image::new(self.imgs.banner_top) @@ -478,7 +480,7 @@ impl MainMenuUi { }; } // Info Window - Rectangle::fill_with([550.0, 250.0], color::BLACK) + Rectangle::fill_with([550.0, 250.0], COL1) .top_left_with_margins_on(ui_widgets.window, 40.0, 40.0) .color(Color::Rgba(0.0, 0.0, 0.0, 0.95)) .set(self.ids.info_frame, ui_widgets); @@ -510,16 +512,16 @@ impl MainMenuUi { } // Username - Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97)) - .mid_top_with_margin_on(self.ids.banner_top, 160.0) + Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.0)) + .mid_top_with_margin_on(self.ids.banner_top, 150.0) .set(self.ids.usrnm_bg, ui_widgets); - Image::new(self.imgs.input_bg_top) - .w_h(337.0, 67.0) + Image::new(self.imgs.input_bg) + .w_h(338.0, 50.0) .middle_of(self.ids.usrnm_bg) .set(self.ids.username_bg, ui_widgets); for event in TextBox::new(&self.username) .w_h(290.0, 30.0) - .mid_bottom_with_margin_on(self.ids.username_bg, 38.0 / 2.0) + .mid_bottom_with_margin_on(self.ids.username_bg, 14.0) .font_size(self.fonts.cyri.scale(22)) .font_id(self.fonts.cyri.conrod_id) .text_color(TEXT_COLOR) @@ -539,16 +541,16 @@ impl MainMenuUi { } } // Password - Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97)) - .down_from(self.ids.usrnm_bg, 30.0) + Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.0)) + .down_from(self.ids.usrnm_bg, 10.0) .set(self.ids.passwd_bg, ui_widgets); - Image::new(self.imgs.input_bg_mid) - .w_h(337.0, 67.0) + Image::new(self.imgs.input_bg) + .w_h(338.0, 50.0) .middle_of(self.ids.passwd_bg) .set(self.ids.password_bg, ui_widgets); for event in TextBox::new(&self.password) .w_h(290.0, 30.0) - .mid_bottom_with_margin_on(self.ids.password_bg, 17.0) + .mid_bottom_with_margin_on(self.ids.password_bg, 10.0) // the text is smaller to allow longer passwords, conrod limits text length // this allows 35 characters but can be increased, approximate formula: 420 / scale = length .font_size(self.fonts.cyri.scale(12)) @@ -636,16 +638,16 @@ impl MainMenuUi { }; } // Server address - Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97)) - .down_from(self.ids.passwd_bg, 30.0) + Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.0)) + .down_from(self.ids.passwd_bg, 8.0) .set(self.ids.srvr_bg, ui_widgets); - Image::new(self.imgs.input_bg_bot) - .w_h(337.0, 67.0) + Image::new(self.imgs.input_bg) + .w_h(338.0, 50.0) .middle_of(self.ids.srvr_bg) .set(self.ids.address_bg, ui_widgets); for event in TextBox::new(&self.server_address) .w_h(290.0, 30.0) - .mid_top_with_margin_on(self.ids.address_bg, 28.0 / 2.0) + .mid_top_with_margin_on(self.ids.address_bg, 8.0) .font_size(self.fonts.cyri.scale(22)) .font_id(self.fonts.cyri.conrod_id) .text_color(TEXT_COLOR)