|
185 | 185 | <v:CommitMessageTextBox Grid.Row="2" Text="{Binding CommitMessage, Mode=TwoWay}"/> |
186 | 186 |
|
187 | 187 | <!-- Commit Options --> |
188 | | - <Grid Grid.Row="3" Margin="0,6,0,0" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto"> |
| 188 | + <Grid Grid.Row="3" Margin="0,6,0,0" ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto"> |
189 | 189 | <Button Grid.Column="0" |
190 | 190 | Classes="icon_button" |
191 | 191 | Margin="4,0,0,0" Padding="0" |
|
217 | 217 | </Button> |
218 | 218 |
|
219 | 219 | <CheckBox Grid.Column="3" |
220 | | - Height="24" |
221 | | - Margin="4,0,0,0" |
222 | | - HorizontalAlignment="Left" |
223 | | - IsChecked="{Binding AutoStageBeforeCommit, Mode=TwoWay}" |
224 | | - Content="{DynamicResource Text.WorkingCopy.AutoStage}"/> |
225 | | - |
226 | | - <CheckBox Grid.Column="4" |
227 | 220 | Height="24" |
228 | 221 | Margin="8,0,0,0" |
229 | 222 | HorizontalAlignment="Left" |
230 | 223 | IsChecked="{Binding UseAmend, Mode=TwoWay}" |
231 | 224 | Content="{DynamicResource Text.WorkingCopy.Amend}"/> |
232 | 225 |
|
233 | | - <v:LoadingIcon Grid.Column="6" Width="18" Height="18" IsVisible="{Binding IsCommitting}"/> |
| 226 | + <v:LoadingIcon Grid.Column="5" Width="18" Height="18" IsVisible="{Binding IsCommitting}"/> |
234 | 227 |
|
235 | | - <Button Grid.Column="7" |
| 228 | + <Button Grid.Column="6" |
236 | 229 | Classes="flat primary" |
237 | 230 | Content="{DynamicResource Text.WorkingCopy.Commit}" |
238 | 231 | Height="28" |
|
257 | 250 | </Button> |
258 | 251 |
|
259 | 252 | <!-- Invisible button just to add another hotkey `Ctrl+Shift+Enter` to commit with auto-stage --> |
260 | | - <Button Grid.Column="8" |
| 253 | + <Button Grid.Column="7" |
261 | 254 | Width="0" Height="0" |
262 | 255 | Background="Transparent" |
263 | 256 | Command="{Binding CommitWithAutoStage}" |
264 | 257 | HotKey="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+Shift+Enter}"/> |
265 | 258 |
|
266 | | - <Button Grid.Column="9" |
| 259 | + <Button Grid.Column="8" |
267 | 260 | Classes="flat" |
268 | 261 | Content="{DynamicResource Text.WorkingCopy.CommitAndPush}" |
269 | 262 | Height="28" |
|
0 commit comments