style<*>: add border for main window; changed popup background for dark theme; use Consolas for changes in stashes view

This commit is contained in:
leo 2021-03-29 16:26:05 +08:00
parent 872eec85b7
commit e00271199a
3 changed files with 5 additions and 2 deletions

View file

@ -6,7 +6,7 @@
<SolidColorBrush x:Key="Brush.TitleBar" Color="#FF1B1B1B"/> <SolidColorBrush x:Key="Brush.TitleBar" Color="#FF1B1B1B"/>
<SolidColorBrush x:Key="Brush.Window" Color="#FF252525"/> <SolidColorBrush x:Key="Brush.Window" Color="#FF252525"/>
<SolidColorBrush x:Key="Brush.NewPageHover" Color="#FF404040"/> <SolidColorBrush x:Key="Brush.NewPageHover" Color="#FF404040"/>
<SolidColorBrush x:Key="Brush.Popup" Color="#FF252525"/> <SolidColorBrush x:Key="Brush.Popup" Color="#FF2B2B2B"/>
<SolidColorBrush x:Key="Brush.Contents" Color="#FF1B1B1B"/> <SolidColorBrush x:Key="Brush.Contents" Color="#FF1B1B1B"/>
<SolidColorBrush x:Key="Brush.Badge" Color="#FF8F8F8F"/> <SolidColorBrush x:Key="Brush.Badge" Color="#FF8F8F8F"/>
<SolidColorBrush x:Key="Brush.CommitViewer" Color="#FF222222"/> <SolidColorBrush x:Key="Brush.CommitViewer" Color="#FF222222"/>

View file

@ -21,7 +21,7 @@
</WindowChrome.WindowChrome> </WindowChrome.WindowChrome>
<!-- Window Layout --> <!-- Window Layout -->
<Border> <Border BorderBrush="{StaticResource Brush.Border3}">
<!-- Fix Maximize BUG --> <!-- Fix Maximize BUG -->
<Border.Style> <Border.Style>
@ -29,9 +29,11 @@
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding WindowState, ElementName=me}" Value="Maximized"> <DataTrigger Binding="{Binding WindowState, ElementName=me}" Value="Maximized">
<Setter Property="Margin" Value="{x:Static local:Launcher.MAXIMIZE_MARGIN}"/> <Setter Property="Margin" Value="{x:Static local:Launcher.MAXIMIZE_MARGIN}"/>
<Setter Property="BorderThickness" Value="0"/>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding WindowState, ElementName=me}" Value="Normal"> <DataTrigger Binding="{Binding WindowState, ElementName=me}" Value="Normal">
<Setter Property="Margin" Value="0"/> <Setter Property="Margin" Value="0"/>
<Setter Property="BorderThickness" Value="1"/>
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>

View file

@ -101,6 +101,7 @@
<ListView.ItemContainerStyle> <ListView.ItemContainerStyle>
<Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource Style.ListViewItem.Borderless}"> <Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource Style.ListViewItem.Borderless}">
<Setter Property="Padding" Value="0"/> <Setter Property="Padding" Value="0"/>
<Setter Property="TextBlock.FontFamily" Value="Consolas"/>
</Style> </Style>
</ListView.ItemContainerStyle> </ListView.ItemContainerStyle>
<ListView.ItemTemplate> <ListView.ItemTemplate>