first pass of merging in warp (doesn't build)

app/src/workspace/hoa_onboarding/hoa_onboarding_flow.rs

@@ -1,5 +1,12 @@
 use std::path::PathBuf;
 
+use markdown_parser::{
+    FormattedText, FormattedTextFragment, FormattedTextLine, FormattedTextStyles, Hyperlink,
+};
+use pathfinder_color::ColorU;
+use settings::Setting;
+use galaxy_core::ui::theme::phenomenon::PhenomenonStyle;
+use galaxy_core::ui::theme::Fill;
 use galaxyui::elements::{
     Align, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Empty, Flex,
     FormattedTextElement, MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Radius,
@@ -19,9 +26,7 @@ use markdown_parser::{
     FormattedText, FormattedTextFragment, FormattedTextLine, FormattedTextStyles, Hyperlink,
 };
 
-use galaxy_core::ui::theme::{phenomenon::PhenomenonStyle, Fill};
-use pathfinder_color::ColorU;
-
+use super::{tab_config_step, welcome_banner};
 use crate::appearance::Appearance;
 use crate::settings::AISettings;
 use crate::tab_configs::session_config::{is_git_repo, SessionConfigSelection, SessionType};
@@ -36,11 +41,6 @@ use crate::view_components::callout_bubble::{
 };
 use crate::workspace::tab_settings::TabSettings;
 
-use settings::Setting;
-
-use super::tab_config_step;
-use super::welcome_banner;
-
 const CALLOUT_WIDTH: f32 = 480.;
 
 struct HoaPrimaryButtonTheme;

app/src/workspace/hoa_onboarding/mod.rs

@@ -3,10 +3,8 @@ mod tab_config_step;
 mod welcome_banner;
 
 pub use hoa_onboarding_flow::{init, HoaOnboardingFlow, HoaOnboardingFlowEvent, HoaOnboardingStep};
-
-use galaxyui::AppContext;
-
 use galaxy_core::user_preferences::GetUserPreferences;
+use galaxyui::AppContext;
 
 const HAS_COMPLETED_HOA_ONBOARDING_KEY: &str = "HasCompletedHOAOnboarding";
 

app/src/workspace/hoa_onboarding/tab_config_step.rs

@@ -5,8 +5,7 @@ use galaxyui::elements::{
 };
 use galaxyui::fonts::{Properties, Weight};
 use galaxyui::geometry::vector::Vector2F;
-use galaxyui::Element;
-use galaxyui::EventContext;
+use galaxyui::{Element, EventContext};
 
 use crate::appearance::Appearance;
 use crate::tab_configs::session_config::SessionType;

app/src/workspace/hoa_onboarding/welcome_banner.rs

@@ -1,4 +1,6 @@
-use galaxy_core::ui::theme::{phenomenon::PhenomenonStyle, Fill};
+use pathfinder_geometry::vector::vec2f;
+use galaxy_core::ui::theme::phenomenon::PhenomenonStyle;
+use galaxy_core::ui::theme::Fill;
 use galaxyui::assets::asset_cache::AssetSource;
 use galaxyui::elements::{
     CacheOption, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius,
@@ -6,15 +8,12 @@ use galaxyui::elements::{
     ParentElement, ParentOffsetBounds, Radius, Stack, Text,
 };
 use galaxyui::fonts::{Properties, Weight};
-use galaxyui::Element;
-use pathfinder_geometry::vector::vec2f;
+use galaxyui::{Element, ViewHandle};
 
 use crate::appearance::Appearance;
 use crate::ui_components::icons::Icon;
 use crate::view_components::action_button::ActionButton;
 
-use galaxyui::ViewHandle;
-
 const BANNER_WIDTH: f32 = 420.;
 const HERO_HEIGHT: f32 = 92.;
 const HERO_IMAGE_PATH: &str = "async/png/onboarding/hoa_welcome_banner.png";
@@ -85,15 +84,23 @@ pub fn render_welcome_banner(
     );
 
     // "New" badge
-    let badge = Container::new(
-        Text::new_inline("New".to_string(), appearance.ui_font_family(), 14.)
-            .with_color(PhenomenonStyle::modal_badge_text())
-            .finish(),
+    let text = Text::new_inline("New".to_string(), appearance.ui_font_family(), 14.)
+        .with_color(PhenomenonStyle::modal_badge_text())
+        .finish();
+    let badge = ConstrainedBox::new(
+        Container::new(
+            Flex::row()
+                .with_cross_axis_alignment(CrossAxisAlignment::Center)
+                .with_main_axis_size(MainAxisSize::Min)
+                .with_child(text)
+                .finish(),
+        )
+        .with_horizontal_padding(8.)
+        .with_background(Fill::Solid(PhenomenonStyle::modal_badge_background()))
+        .with_corner_radius(CornerRadius::with_all(Radius::Percentage(50.)))
+        .finish(),
     )
-    .with_horizontal_padding(8.)
-    .with_vertical_padding(2.)
-    .with_corner_radius(CornerRadius::with_all(Radius::Pixels(4.)))
-    .with_background(Fill::Solid(PhenomenonStyle::modal_badge_background()))
+    .with_height(24.)
     .finish();
 
     // Title