Skip to content

Commit

Permalink
Merge pull request #22 from ennerperez/feature/syntax_fixes
Browse files Browse the repository at this point in the history
Syntax Fixes
  • Loading branch information
love-linger authored Mar 13, 2024
2 parents 7dd41b8 + f70d484 commit 499a823
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions src/Views/Archive.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
<DataTemplate DataType="m:Branch">
<StackPanel Orientation="Horizontal">
<Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
<TextBlock VerticalAlignment="Center" Text="{Binding, Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
</StackPanel>
</DataTemplate>

<DataTemplate DataType="m:Commit">
<StackPanel Orientation="Horizontal">
<Path Width="14" Height="14" Margin="0,8,0,0" Data="{StaticResource Icons.Commit}"/>
<TextBlock Classes="monospace" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Subject}}" Margin="4,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0"/>
</StackPanel>
</DataTemplate>

Expand Down
2 changes: 1 addition & 1 deletion src/Views/CherryPick.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<StackPanel Grid.Column="1" Orientation="Horizontal">
<Path Width="14" Height="14" Margin="0,8,0,0" Data="{StaticResource Icons.Commit}"/>
<TextBlock Classes="monospace" VerticalAlignment="Center" Text="{Binding Target.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Target.Subject}}" Margin="4,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Target.Subject}" Margin="4,0,0,0"/>
</StackPanel>

<CheckBox Grid.Row="1" Grid.Column="1"
Expand Down
2 changes: 1 addition & 1 deletion src/Views/CommitBaseInfo.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<TextBlock Classes="monospace"
Text="{Binding, Converter={x:Static c:StringConverters.ToShortSHA}}"
Text="{Binding Converter={x:Static c:StringConverters.ToShortSHA}}"
FontSize="12"
Foreground="DarkOrange"
TextDecorations="Underline"
Expand Down
4 changes: 2 additions & 2 deletions src/Views/CreateBranch.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
<DataTemplate DataType="m:Branch">
<StackPanel Orientation="Horizontal">
<Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
<TextBlock VerticalAlignment="Center" Text="{Binding, Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
</StackPanel>
</DataTemplate>

<DataTemplate DataType="m:Commit">
<StackPanel Orientation="Horizontal">
<Path Width="14" Height="14" Margin="0,8,0,0" Data="{StaticResource Icons.Commit}"/>
<TextBlock Classes="monospace" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Subject}}" Margin="4,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0"/>
</StackPanel>
</DataTemplate>

Expand Down
4 changes: 2 additions & 2 deletions src/Views/CreateTag.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
<DataTemplate DataType="m:Branch">
<StackPanel Orientation="Horizontal">
<Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
<TextBlock VerticalAlignment="Center" Text="{Binding, Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
</StackPanel>
</DataTemplate>

<DataTemplate DataType="m:Commit">
<StackPanel Orientation="Horizontal">
<Path Width="14" Height="14" Margin="0,8,0,0" Data="{StaticResource Icons.Commit}"/>
<TextBlock Classes="monospace" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Subject}}" Margin="4,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0"/>
</StackPanel>
</DataTemplate>
</ContentControl.DataTemplates>
Expand Down
4 changes: 2 additions & 2 deletions src/Views/EditRepositoryNode.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
<DataTemplate>
<Border Height="20" VerticalAlignment="Center">
<Path Width="12" Height="12"
Fill="{Binding, Converter={x:Static c:BookmarkConverters.ToBrush}}"
StrokeThickness="{Binding, Converter={x:Static c:BookmarkConverters.ToStrokeThickness}}"
Fill="{Binding Converter={x:Static c:BookmarkConverters.ToBrush}}"
StrokeThickness="{Binding Converter={x:Static c:BookmarkConverters.ToStrokeThickness}}"
Stroke="{DynamicResource Brush.FG1}"
HorizontalAlignment="Center" VerticalAlignment="Center"
Data="{StaticResource Icons.Bookmark}"/>
Expand Down
4 changes: 2 additions & 2 deletions src/Views/Launcher.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
<DataTemplate>
<Border Height="20" VerticalAlignment="Center">
<Path Width="12" Height="12"
Fill="{Binding, Converter={x:Static c:BookmarkConverters.ToBrush}}"
StrokeThickness="{Binding, Converter={x:Static c:BookmarkConverters.ToStrokeThickness}}"
Fill="{Binding Converter={x:Static c:BookmarkConverters.ToBrush}}"
StrokeThickness="{Binding Converter={x:Static c:BookmarkConverters.ToStrokeThickness}}"
Stroke="{DynamicResource Brush.FG1}"
HorizontalAlignment="Center" VerticalAlignment="Center"
Data="{StaticResource Icons.Bookmark}"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Views/Pull.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<DataTemplate x:DataType="{x:Type m:Branch}">
<StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
<Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
<TextBlock Text="{Binding, Converter={x:Static c:BranchConverters.ToName}}"/>
<TextBlock Text="{Binding Converter={x:Static c:BranchConverters.ToName}}"/>
</StackPanel>
</DataTemplate>
</ComboBox.ItemTemplate>
Expand Down
4 changes: 2 additions & 2 deletions src/Views/Rebase.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
<DataTemplate DataType="m:Branch">
<StackPanel Orientation="Horizontal">
<Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
<TextBlock VerticalAlignment="Center" Text="{Binding, Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
</StackPanel>
</DataTemplate>

<DataTemplate DataType="m:Commit">
<StackPanel Orientation="Horizontal">
<Path Width="14" Height="14" Margin="0,8,0,0" Data="{StaticResource Icons.Commit}"/>
<TextBlock Classes="monospace" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Subject}}" Margin="4,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0"/>
</StackPanel>
</DataTemplate>
</ContentControl.DataTemplates>
Expand Down
2 changes: 1 addition & 1 deletion src/Views/Revert.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<StackPanel Grid.Column="1" Orientation="Horizontal">
<Path Width="14" Height="14" Margin="0,8,0,0" Data="{StaticResource Icons.Commit}"/>
<TextBlock Classes="monospace" VerticalAlignment="Center" Text="{Binding Target.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Target.Subject}}" Margin="4,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="{Binding Target.Subject}" Margin="4,0,0,0"/>
</StackPanel>

<CheckBox Grid.Row="1" Grid.Column="1"
Expand Down

0 comments on commit 499a823

Please sign in to comment.