|
58 | 58 | <Style Selector="Path.icon"> |
59 | 59 | <Setter Property="Width" Value="12"/> |
60 | 60 | <Setter Property="Height" Value="12"/> |
61 | | - <Setter Property="Margin" Value="8,0,6,0"/> |
| 61 | + <Setter Property="Margin" Value="6,0"/> |
62 | 62 | <Setter Property="Fill" Value="{DynamicResource Brush.FG2}"/> |
63 | 63 | </Style> |
64 | 64 | <Style Selector="TextBlock.header"> |
|
70 | 70 | <Setter Property="Margin" Value="0"/> |
71 | 71 | <Setter Property="Padding" Value="0"/> |
72 | 72 | <Setter Property="BorderThickness" Value="0"/> |
73 | | - <Setter Property="CornerRadius" Value="4"/> |
| 73 | + <Setter Property="CornerRadius" Value="0"/> |
74 | 74 | </Style> |
75 | | - <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter"> |
| 75 | + <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter#PART_ContentPresenter, ListBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter"> |
76 | 76 | <Setter Property="Background" Value="Transparent"/> |
77 | 77 | </Style> |
78 | | - <Style Selector="ListBoxItem:selected /template/ ContentPresenter#PART_ContentPresenter"> |
79 | | - <Setter Property="Background" Value="{DynamicResource Brush.AccentHovered}"/> |
| 78 | + <Style Selector="ListBoxItem:selected"> |
| 79 | + <Setter Property="BorderBrush" Value="{DynamicResource Brush.FG1}"/> |
| 80 | + </Style> |
| 81 | + <Style Selector="ListBoxItem:selected Rectangle.indicator"> |
| 82 | + <Setter Property="Fill" Value="{DynamicResource Brush.FG1}"/> |
80 | 83 | </Style> |
81 | 84 | <Style Selector="ListBoxItem:selected TextBlock.header"> |
82 | 85 | <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/> |
|
93 | 96 | </ListBox.ItemsPanel> |
94 | 97 |
|
95 | 98 | <ListBoxItem> |
96 | | - <Grid ColumnDefinitions="Auto,*,Auto"> |
97 | | - <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Histories}"/> |
98 | | - <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Histories}"/> |
99 | | - <Button Grid.Column="2" |
| 99 | + <Grid ColumnDefinitions="4,Auto,*,Auto"> |
| 100 | + <Rectangle Grid.Column="0" Classes="indicator" Width="4" Height="20" VerticalAlignment="Center"/> |
| 101 | + <Path Grid.Column="1" Classes="icon" Data="{StaticResource Icons.Histories}"/> |
| 102 | + <TextBlock Grid.Column="2" Classes="header" Text="{DynamicResource Text.Histories}"/> |
| 103 | + <Button Grid.Column="3" |
100 | 104 | Classes="icon_button" |
101 | 105 | Width="26" Height="26" |
102 | 106 | Click="OnOpenAdvancedHistoriesOption" |
|
107 | 111 | </ListBoxItem> |
108 | 112 |
|
109 | 113 | <ListBoxItem IsVisible="{Binding !IsBare}"> |
110 | | - <Grid ColumnDefinitions="Auto,*,Auto,Auto,Auto"> |
111 | | - <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Changes}"/> |
112 | | - <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.WorkingCopy}"/> |
113 | | - <Border Grid.Column="2" |
| 114 | + <Grid ColumnDefinitions="4,Auto,*,Auto,Auto,Auto"> |
| 115 | + <Rectangle Grid.Column="0" Classes="indicator" Width="4" Height="20" VerticalAlignment="Center"/> |
| 116 | + <Path Grid.Column="1" Classes="icon" Data="{StaticResource Icons.Changes}"/> |
| 117 | + <TextBlock Grid.Column="2" Classes="header" Text="{DynamicResource Text.WorkingCopy}"/> |
| 118 | + <Border Grid.Column="3" |
114 | 119 | Height="18" |
115 | 120 | Margin="6,0" Padding="9,0" |
116 | 121 | CornerRadius="9" |
|
122 | 127 | FontFamily="{DynamicResource Fonts.Monospace}" |
123 | 128 | FontSize="10"/> |
124 | 129 | </Border> |
125 | | - <Path Grid.Column="3" |
| 130 | + <Path Grid.Column="4" |
126 | 131 | Width="12" Height="12" |
127 | 132 | Margin="0,0,6,0" |
128 | 133 | Data="{StaticResource Icons.Info}" |
129 | 134 | Fill="DarkOrange" |
130 | 135 | IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"/> |
131 | | - <Button Grid.Column="4" |
| 136 | + <Button Grid.Column="5" |
132 | 137 | Classes="icon_button" |
133 | 138 | Width="26" Height="26" |
134 | 139 | Command="{Binding DiscardAllChanges}" |
|
139 | 144 | </ListBoxItem> |
140 | 145 |
|
141 | 146 | <ListBoxItem IsVisible="{Binding !IsBare}"> |
142 | | - <Grid ColumnDefinitions="Auto,*,Auto,Auto"> |
143 | | - <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Stashes}"/> |
144 | | - <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Stashes}"/> |
145 | | - <Border Grid.Column="2" |
| 147 | + <Grid ColumnDefinitions="4,Auto,*,Auto,Auto"> |
| 148 | + <Rectangle Grid.Column="0" Classes="indicator" Width="4" Height="20" VerticalAlignment="Center"/> |
| 149 | + <Path Grid.Column="1" Classes="icon" Data="{StaticResource Icons.Stashes}"/> |
| 150 | + <TextBlock Grid.Column="2" Classes="header" Text="{DynamicResource Text.Stashes}"/> |
| 151 | + <Border Grid.Column="3" |
146 | 152 | Height="18" |
147 | 153 | Margin="6,0" Padding="9,0" |
148 | 154 | CornerRadius="9" |
|
154 | 160 | FontFamily="{DynamicResource Fonts.Monospace}" |
155 | 161 | FontSize="10"/> |
156 | 162 | </Border> |
157 | | - <Button Grid.Column="3" |
| 163 | + <Button Grid.Column="4" |
158 | 164 | Classes="icon_button" |
159 | 165 | Width="26" Height="26" |
160 | 166 | Command="{Binding ClearStashes}" |
|
0 commit comments