Styling improvements
This commit is contained in:
parent
b60f2a4f47
commit
89d7d65d8d
@ -43,6 +43,9 @@
|
|||||||
<Folder Include="Design\Views\Profile\" />
|
<Folder Include="Design\Views\Profile\" />
|
||||||
<Folder Include="Design\Components\DataGrid\" />
|
<Folder Include="Design\Components\DataGrid\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Remove="Design\Behaviors\DeselectItemBehaviorBase.cs" />
|
||||||
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Update="Design\Components\MusicPlayer\Player.xaml.cs">
|
<Compile Update="Design\Components\MusicPlayer\Player.xaml.cs">
|
||||||
<DependentUpon>Player.xaml</DependentUpon>
|
<DependentUpon>Player.xaml</DependentUpon>
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
Label {
|
Label {
|
||||||
margin-left: 25;
|
margin-left: 25;
|
||||||
|
text-align: left;
|
||||||
|
vertical-align: middle;
|
||||||
|
word-wrap: break-word;
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
SelectionEnabled="True"
|
SelectionEnabled="True"
|
||||||
RowHeight="30"
|
RowHeight="30"
|
||||||
BorderColor="#3a3a3a"
|
BorderColor="#3a3a3a"
|
||||||
BorderThickness="0"
|
|
||||||
HeaderFontSize="14"
|
HeaderFontSize="14"
|
||||||
HeaderHeight="45"
|
HeaderHeight="45"
|
||||||
HeaderTextColor="White"
|
HeaderTextColor="White"
|
||||||
@ -27,7 +26,7 @@
|
|||||||
<dg:DataGridColumn
|
<dg:DataGridColumn
|
||||||
Title=""
|
Title=""
|
||||||
PropertyName="Icon"
|
PropertyName="Icon"
|
||||||
Width="5">
|
Width="15">
|
||||||
<dg:DataGridColumn.CellTemplate>
|
<dg:DataGridColumn.CellTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Image Source="../../Resources/unselected.png" />
|
<Image Source="../../Resources/unselected.png" />
|
||||||
@ -43,9 +42,7 @@
|
|||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Label
|
<Label
|
||||||
LineBreakMode="TailTruncation"
|
LineBreakMode="TailTruncation"
|
||||||
Text="{Binding .}"
|
Text="{Binding .}"/>
|
||||||
HorizontalOptions="Start"
|
|
||||||
VerticalOptions="Center"/>
|
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</dg:DataGridColumn.CellTemplate>
|
</dg:DataGridColumn.CellTemplate>
|
||||||
</dg:DataGridColumn>
|
</dg:DataGridColumn>
|
||||||
@ -58,9 +55,7 @@
|
|||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Label
|
<Label
|
||||||
LineBreakMode="TailTruncation"
|
LineBreakMode="TailTruncation"
|
||||||
Text="{Binding .}"
|
Text="{Binding .}"/>
|
||||||
HorizontalOptions="Start"
|
|
||||||
VerticalOptions="Center"/>
|
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</dg:DataGridColumn.CellTemplate>
|
</dg:DataGridColumn.CellTemplate>
|
||||||
</dg:DataGridColumn>
|
</dg:DataGridColumn>
|
||||||
@ -72,19 +67,18 @@
|
|||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Label
|
<Label
|
||||||
LineBreakMode="TailTruncation"
|
LineBreakMode="TailTruncation"
|
||||||
Text="{Binding .}"
|
Text="{Binding .}"/>
|
||||||
HorizontalOptions="Start"
|
|
||||||
VerticalOptions="Center"
|
|
||||||
TextColor="White"/>
|
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</dg:DataGridColumn.CellTemplate>
|
</dg:DataGridColumn.CellTemplate>
|
||||||
</dg:DataGridColumn>
|
</dg:DataGridColumn>
|
||||||
</dg:DataGrid.Columns>
|
</dg:DataGrid.Columns>
|
||||||
|
|
||||||
<dg:DataGrid.RowsTextColorPalette>
|
<dg:DataGrid.RowsTextColorPalette>
|
||||||
<dg:PaletteCollection>
|
<dg:PaletteCollection>
|
||||||
<Color>White</Color>
|
<Color>White</Color>
|
||||||
</dg:PaletteCollection>
|
</dg:PaletteCollection>
|
||||||
</dg:DataGrid.RowsTextColorPalette>
|
</dg:DataGrid.RowsTextColorPalette>
|
||||||
|
|
||||||
<dg:DataGrid.RowsBackgroundColorPalette>
|
<dg:DataGrid.RowsBackgroundColorPalette>
|
||||||
<dg:PaletteCollection>
|
<dg:PaletteCollection>
|
||||||
<Color>Transparent</Color>
|
<Color>Transparent</Color>
|
||||||
|
@ -17,11 +17,12 @@ ListView {
|
|||||||
font-size: 12;
|
font-size: 12;
|
||||||
font-family: Courier New, Courier, monospace;
|
font-family: Courier New, Courier, monospace;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
padding-top: 18;
|
padding-top: 20;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ItemCell label {
|
#ItemCell Label {
|
||||||
color: white;
|
color: white;
|
||||||
|
background-color: #232323;
|
||||||
font-size: 15;
|
font-size: 15;
|
||||||
font-family: Courier New, Courier, monospace;
|
font-family: Courier New, Courier, monospace;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
<ContentView
|
<ContentView
|
||||||
xmlns="http://xamarin.com/schemas/2014/forms"
|
xmlns="http://xamarin.com/schemas/2014/forms"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||||
|
xmlns:behaviors="clr-namespace:Aurora.Design.Behaviors"
|
||||||
x:Class="Aurora.Design.Components.NavigationMenu.NavigationMenu">
|
x:Class="Aurora.Design.Components.NavigationMenu.NavigationMenu">
|
||||||
<ContentView.Resources>
|
<ContentView.Resources>
|
||||||
<StyleSheet
|
<StyleSheet
|
||||||
@ -12,6 +13,7 @@
|
|||||||
<ListView
|
<ListView
|
||||||
x:Name="MenuItemsListView"
|
x:Name="MenuItemsListView"
|
||||||
HasUnevenRows="true"
|
HasUnevenRows="true"
|
||||||
|
SeparatorVisibility="None"
|
||||||
IsGroupingEnabled="true"
|
IsGroupingEnabled="true"
|
||||||
RowHeight="35"
|
RowHeight="35"
|
||||||
CachingStrategy="RecycleElement">
|
CachingStrategy="RecycleElement">
|
||||||
|
@ -11,8 +11,13 @@ namespace Aurora.Design.Components.NavigationMenu
|
|||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
ListView = MenuItemsListView;
|
ListView = MenuItemsListView;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ListView_ItemSelected(object sender, SelectedItemChangedEventArgs e)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
public ListView ListView;
|
public ListView ListView;
|
||||||
|
|
||||||
|
@ -140,7 +140,7 @@ namespace Aurora.Services.ClientService
|
|||||||
|
|
||||||
public void StopEvents()
|
public void StopEvents()
|
||||||
{
|
{
|
||||||
if (!_eventCancellationTokenSource.IsCancellationRequested)
|
if (_eventCancellationTokenSource != null && !_eventCancellationTokenSource.IsCancellationRequested)
|
||||||
{
|
{
|
||||||
_eventCancellationTokenSource.Cancel();
|
_eventCancellationTokenSource.Cancel();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user