NebulaTeam/NebulaLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- tweak: Style change - start

Browse Source
This commit is contained in:
Cinka
2025-01-20 16:35:48 +03:00
parent 19de47bacf
commit 86e0536f0f
7 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/.idea.Nebula/.idea/avalonia.xml generated
View File

@@ -4,6 +4,7 @@
<option name="projectPerEditor"> <option name="projectPerEditor">
<map> <map>
<entry key="Nebula.Launcher/App.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/App.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Assets/AppResources.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Assets/Icons.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Assets/Icons.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Assets/Resources.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Assets/Resources.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />
<entry key="Nebula.Launcher/Assets/Style.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" /> <entry key="Nebula.Launcher/Assets/Style.axaml" value="Nebula.Launcher/Nebula.Launcher.csproj" />

8
Nebula.Launcher/App.axaml
View File

@@ -5,6 +5,14 @@
xmlns:local="using:Nebula.Launcher" xmlns:local="using:Nebula.Launcher"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<MergeResourceInclude Source="/Assets/AppResources.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
<Application.DataTemplates> <Application.DataTemplates>
<local:ViewLocator /> <local:ViewLocator />
</Application.DataTemplates> </Application.DataTemplates>

4
Nebula.Launcher/Assets/AppResources.axaml Normal file
View File

@@ -0,0 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="NoneBackground">#00000000</SolidColorBrush>
<SolidColorBrush x:Key="DefaultBackground">#121212</SolidColorBrush>
</ResourceDictionary>

27
Nebula.Launcher/Assets/Style.axaml
View File

@@ -4,34 +4,37 @@
</Style> </Style>
<Style Selector="Border"> <Style Selector="Border">
<Setter Property="BorderBrush" Value="#343334" /> <Setter Property="BorderBrush" Value="#343334" />
<Setter Property="Background" Value="#222222" /> <Setter Property="Background" Value="{StaticResource NoneBackground}" />
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="BoxShadow" Value="0 0 10 0 #222222" />
</Style> </Style>
<Style Selector="Label"> <Style Selector="Label">
<Setter Property="Foreground" Value="#f7f7ff" /> <Setter Property="Foreground" Value="#f7f7ff" />
</Style> </Style>
<Style Selector="ItemsControl">
<Setter Property="Background" Value="{StaticResource NoneBackground}" />
</Style>
<Style Selector="Button"> <Style Selector="Button">
<Setter Property="BorderBrush" Value="#343334" /> <Setter Property="BorderBrush" Value="#343334" />
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="5" /> <Setter Property="Padding" Value="5" />
<Setter Property="CornerRadius" Value="10" /> <Setter Property="CornerRadius" Value="10" />
<Setter Property="Background" Value="{StaticResource NoneBackground}" />
</Style> </Style>
<Style Selector="Button:pressed"> <Style Selector="Button:pressed">
<Setter Property="RenderTransform" Value="{x:Null}" /> <Setter Property="Background" Value="{StaticResource NoneBackground}" />
</Style> </Style>
<Style Selector="Border.ButtonBack"> <Style Selector="Button:pointerover">
<Setter Property="Background" Value="#e63462" /> <Setter Property="BorderThickness" Value="0,0,0,2" />
<Setter Property="CornerRadius" Value="0,0,10,0" />
</Style> </Style>
<Style Selector="Button.ViewSelectButton"> <Style Selector="Button.ViewSelectButton">
<Setter Property="CornerRadius" Value="0,8,8,0" /> <Setter Property="CornerRadius" Value="0,8,8,0" />
<Setter Property="Margin" Value="0,0,0,5" /> <Setter Property="Margin" Value="0,0,0,5" />
<Setter Property="Padding" Value="8" /> <Setter Property="Padding" Value="8" />
<Setter Property="Background" Value="#00000000" /> <Setter Property="Background" Value="{StaticResource NoneBackground}" />
</Style> </Style>
<Style Selector="Button.ViewSelectButton:pressed"> <Style Selector="Button.ViewSelectButton:pressed">
@@ -49,18 +52,18 @@
<Setter Property="CornerRadius" Value="0,8,8,0" /> <Setter Property="CornerRadius" Value="0,8,8,0" />
<Setter Property="Margin" Value="0,0,0,5" /> <Setter Property="Margin" Value="0,0,0,5" />
<Setter Property="Padding" Value="8" /> <Setter Property="Padding" Value="8" />
<Setter Property="Background" Value="#00000000" /> <Setter Property="Background" Value="{StaticResource NoneBackground}" />
</Style> </Style>
<Style Selector="ListBox.AccountSelector > ListBoxItem"> <Style Selector="ListBox.AccountSelector &gt; ListBoxItem">
<Setter Property="CornerRadius" Value="0" /> <Setter Property="CornerRadius" Value="0" />
<Setter Property="Margin" Value="0,0,0,0" /> <Setter Property="Margin" Value="0,0,0,0" />
<Setter Property="Padding" Value="0" /> <Setter Property="Padding" Value="0" />
<Setter Property="Background" Value="#00000000" /> <Setter Property="Background" Value="{StaticResource NoneBackground}" />
<Setter Property="Focusable" Value="False" /> <Setter Property="Focusable" Value="False" />
</Style> </Style>
<Style Selector="ListBox.AccountSelector > ListBoxItem:selected"> <Style Selector="TextBox">
<Setter Property="Background" Value="#00000000" /> <Setter Property="Background" Value="{StaticResource NoneBackground}" />
</Style> </Style>
</Styles> </Styles>

27
Nebula.Launcher/Views/MainView.axaml
View File

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

17
Nebula.Launcher/Views/Pages/ContentBrowserView.axaml
View File

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

7
Nebula.Launcher/Views/ServerEntryView.axaml
View File

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