diff --git a/Material.Avalonia.Demo/MainView.axaml b/Material.Avalonia.Demo/MainView.axaml
index 2ad84be3..5556074d 100644
--- a/Material.Avalonia.Demo/MainView.axaml
+++ b/Material.Avalonia.Demo/MainView.axaml
@@ -72,6 +72,7 @@
Dialogs
Expanders
Fields
+ Fields line up
Lists
Material Icons
Progress indicators
@@ -179,6 +180,9 @@
+
+
+
diff --git a/Material.Avalonia.Demo/Material.Avalonia.Demo.csproj b/Material.Avalonia.Demo/Material.Avalonia.Demo.csproj
index 4275fdcb..fc11370d 100644
--- a/Material.Avalonia.Demo/Material.Avalonia.Demo.csproj
+++ b/Material.Avalonia.Demo/Material.Avalonia.Demo.csproj
@@ -6,23 +6,23 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
diff --git a/Material.Avalonia.Demo/Pages/FieldsLineUpDemo.axaml b/Material.Avalonia.Demo/Pages/FieldsLineUpDemo.axaml
new file mode 100644
index 00000000..46b09b07
--- /dev/null
+++ b/Material.Avalonia.Demo/Pages/FieldsLineUpDemo.axaml
@@ -0,0 +1,195 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Material.Avalonia.Demo/Pages/FieldsLineUpDemo.axaml.cs b/Material.Avalonia.Demo/Pages/FieldsLineUpDemo.axaml.cs
new file mode 100644
index 00000000..e2322904
--- /dev/null
+++ b/Material.Avalonia.Demo/Pages/FieldsLineUpDemo.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Markup.Xaml;
+using Material.Avalonia.Demo.ViewModels;
+
+namespace Material.Avalonia.Demo.Pages;
+
+public partial class FieldsLineUpDemo : UserControl {
+ public FieldsLineUpDemo() {
+ InitializeComponent();
+ }
+}
\ No newline at end of file
diff --git a/Material.Avalonia.Demo/ViewModels/FieldsLineUpDemoViewModel.cs b/Material.Avalonia.Demo/ViewModels/FieldsLineUpDemoViewModel.cs
new file mode 100644
index 00000000..8622177a
--- /dev/null
+++ b/Material.Avalonia.Demo/ViewModels/FieldsLineUpDemoViewModel.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Material.Avalonia.Demo.ViewModels;
+internal class FieldsLineUpDemoViewModel : ViewModelBase {
+ private string? _assistLabel = "My assist label";
+ public string? AssistLabel {
+ get => _assistLabel;
+ set {
+ if (_assistLabel != value) {
+ _assistLabel = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+
+ private string? _watermark = "My watermark";
+ public string? Watermark {
+ get => _watermark;
+ set {
+ if (_watermark != value) {
+ _watermark = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+
+
+
+ public IList ComboBoxItems { get; } = [
+ "Item 1",
+ "Item 2",
+ "Item 3",
+ "Item 4",
+ "Item 5"
+ ];
+}