- tweak: Style change - start

This commit is contained in:
2025-01-20 16:35:48 +03:00
parent 19de47bacf
commit 86e0536f0f
7 changed files with 58 additions and 33 deletions

View File

@@ -1,4 +1,5 @@
<UserControl
Background="{StaticResource DefaultBackground}"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d"
@@ -37,8 +38,9 @@
PaneBackground="#00000000">
<SplitView.Pane>
<Border
Background="{StaticResource DefaultBackground}"
BorderThickness="0,0,2,0"
CornerRadius="0,8,8,0"
CornerRadius="0,0,0,0"
Grid.Column="0"
Grid.Row="0"
Margin="0,0,5,0"
@@ -52,9 +54,10 @@
<ListBox.ItemTemplate>
<DataTemplate DataType="{x:Type models:ListItemTemplate}">
<StackPanel Orientation="Horizontal" Spacing="17">
<Svg Path="{Binding IconKey, Converter={x:Static converters:TypeConverters.IconConverter}}"
Height="40"
Width="40"/>
<Svg
Height="40"
Path="{Binding IconKey, Converter={x:Static converters:TypeConverters.IconConverter}}"
Width="40" />
<TextBlock Text="{Binding Label}" VerticalAlignment="Center" />
</StackPanel>
</DataTemplate>
@@ -84,8 +87,14 @@
Padding="5">
<Label FontSize="10" Foreground="#777777">
<Panel>
<Button Command="{Binding OpenLink}" HorizontalAlignment="Left" VerticalAlignment="Center"
Margin="0" Padding="0" CornerRadius="0" Background="#00000000">
<Button
Background="#00000000"
Command="{Binding OpenLink}"
CornerRadius="0"
HorizontalAlignment="Left"
Margin="0"
Padding="0"
VerticalAlignment="Center">
<TextBlock HorizontalAlignment="Left" VerticalAlignment="Center">https://cinka.ru/nebula-launcher/</TextBlock>
</Button>
<TextBlock HorizontalAlignment="Right" VerticalAlignment="Center">prototype-product-v0.01</TextBlock>
@@ -96,9 +105,7 @@
<Panel IsVisible="{Binding Popup}">
<Border Background="#111" Opacity="50" />
<Border
CornerRadius="10"
Margin="40">
<Border CornerRadius="10" Margin="40">
<Grid RowDefinitions="35,*,20">
<Border
BorderThickness="0,0,0,2"
@@ -110,10 +117,10 @@
</StackPanel>
<Button
Command="{Binding ClosePopupCommand}"
IsVisible="{Binding IsPopupClosable}"
Content="X"
CornerRadius="0,10,0,0"
HorizontalAlignment="Right"
IsVisible="{Binding IsPopupClosable}"
Margin="0"
Padding="10,8,10,8"
VerticalAlignment="Stretch" />

View File

@@ -7,8 +7,8 @@
xmlns="https://github.com/avaloniaui"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages">
xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Design.DataContext>
<pages:ContentBrowserViewModel />
</Design.DataContext>
@@ -17,9 +17,7 @@
ColumnDefinitions="*,2*,40,40"
Margin="8"
RowDefinitions="40,*">
<Border
CornerRadius="10,10,0,0"
Grid.ColumnSpan="4" />
<Border CornerRadius="10,10,0,0" Grid.ColumnSpan="4" />
<TextBox
Grid.Column="0"
Grid.Row="0"
@@ -39,14 +37,14 @@
Grid.Column="2"
Grid.Row="0"
Padding="10">
<Svg Path="/Assets/svg/undo.svg"></Svg>
<Svg Path="/Assets/svg/undo.svg" />
</Button>
<Button
Command="{Binding OnGoEnter}"
Grid.Column="3"
Grid.Row="0"
Padding="10">
<Svg Path="/Assets/svg/next.svg"></Svg>
<Svg Path="/Assets/svg/next.svg" />
</Button>
<ScrollViewer
@@ -54,10 +52,7 @@
Grid.ColumnSpan="4"
Grid.Row="1"
Margin="0,0,0,5">
<ItemsControl
Background="#00000000"
ItemsSource="{Binding Entries}"
Padding="0,0,0,0">
<ItemsControl ItemsSource="{Binding Entries}" Padding="0,0,0,0">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type pages:ContentEntry}">
<Button

View File

@@ -17,11 +17,14 @@
</Design.DataContext>
<Border
Background="#00000000"
BorderThickness="0,0,0,0"
BoxShadow="0 0 10 0 #222222"
CornerRadius="10"
Margin="0,5,0,5">
<Grid ColumnDefinitions="30,*,80,50" RowDefinitions="35,*,*">
<Border
Background="#00000000"
BorderThickness="0,0,0,2"
CornerRadius="10"
Grid.Column="1"
@@ -30,6 +33,8 @@
IsVisible="{Binding ExpandInfo}" />
<Button
Background="#00000000"
BorderThickness="2,0,0,0"
Command="{Binding ExpandInfoRequired}"
CornerRadius="10,0,0,10"
Grid.Column="0"
@@ -89,6 +94,7 @@
</Panel>
<Border
Background="#00000000"
BorderThickness="0,0,0,0"
Grid.Column="1"
Grid.ColumnSpan="3"
@@ -100,6 +106,7 @@
</Label>
</Border>
<Border
Background="#00000000"
BorderThickness="0,2,0,0"
CornerRadius="10"
Grid.Column="1"