Skip to content

Commit

Permalink
bump avalonia ui versions (#83)
Browse files Browse the repository at this point in the history
remove unused styles
  • Loading branch information
cricketthomas authored Aug 14, 2024
1 parent 12e1008 commit a7ed341
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 266 deletions.
2 changes: 1 addition & 1 deletion Desktop/Desktop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@


<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="11.1.2" />
<PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
</ItemGroup>


Expand Down
4 changes: 2 additions & 2 deletions KeyVaultExplorer/KeyVaultExplorer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@


<ItemGroup>
<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.2" />
<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.3" />
<PackageReference Include="Avalonia.Svg.Skia" Version="11.1.0" />
<PackageReference Include="DeviceId" Version="6.7.0" />
<PackageReference Include="FluentAvaloniaUI" Version="2.1.0" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.2" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.0-preview.6.24327.4" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
Expand Down
232 changes: 0 additions & 232 deletions KeyVaultExplorer/ViewModels/.editorconfig

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
IsEnabled="{Binding !IsBusy}"
Text="{Binding SearchQuery, Mode=TwoWay}"
TextWrapping="NoWrap"
Watermark="Search">
Watermark="Filter visible items">
<TextBox.Styles>
<Style Selector="TextBox">
<Setter Property="Background" Value="Transparent" />
Expand Down
2 changes: 1 addition & 1 deletion KeyVaultExplorer/Views/CustomControls/ToolBar.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
Click="IsPaneToggledButton_Click"
FontSize="13"
Theme="{StaticResource TransparentButton}"
ToolTip.Tip="Toggle Vault List Sidebar"
ToolTip.Tip="Show/Hide Vault List Sidebar"
ToolTip.VerticalOffset="10">
<Button.Content>
<StackPanel Orientation="Horizontal">
Expand Down
31 changes: 2 additions & 29 deletions KeyVaultExplorer/Views/Pages/VaultPage.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
Text="{Binding SearchQuery, Mode=TwoWay}"
TextChanged="SearchBoxChanges"
TextWrapping="NoWrap"
Watermark="{Binding VaultContents.Count, StringFormat='Search {0:F0} values/tags (Ctrl+F)'}">
Watermark="{Binding VaultContents.Count, StringFormat='Search {0:F0} names, tags (Ctrl+F)'}">
<TextBox.Styles>
<Style Selector="TextBox">
<Setter Property="Background" Value="Transparent" />
Expand Down Expand Up @@ -333,34 +333,7 @@
Header="ContentType" />

</DataGrid.Columns>
<DataGrid.Styles>
<Style Selector="DataGridRow">
<Setter Property="Height" Value="24" />
<Setter Property="Focusable" Value="True" />
</Style>

<Style Selector="DataGridRow /template/ DataGridCellsPresenter#PART_CellsPresenter">
<Setter Property="Focusable" Value="False" />
</Style>

<Style Selector="DataGridCell/template/ Grid#PART_CellRoot">
<Setter Property="Height" Value="22" />
<Setter Property="Focusable" Value="False" />
</Style>
<!--<Style Selector="DataGridCell">
<Setter Property="Height" Value="22" />
<Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}" />
</Style>
<Style Selector="DataGridRow">
<Setter Property="FontSize" Value="{DynamicResource FontSizeSmall}" />
<Setter Property="Focusable" Value="False" />
</Style>-->
</DataGrid.Styles>
<!--<DataGrid.KeyBindings>
<KeyBinding Gesture="Enter" Command="{Binding CopyCommand}" />
</DataGrid.KeyBindings>-->

<DataGrid.Styles />
</DataGrid>


Expand Down

0 comments on commit a7ed341

Please sign in to comment.