Skip to content
This repository has been archived by the owner on Apr 30, 2024. It is now read-only.

Commit

Permalink
Merge branch 'rewrite' of https://github.com/UWPCommunity/Quarrel int…
Browse files Browse the repository at this point in the history
…o rewrite
  • Loading branch information
matthew4850 committed Nov 3, 2019
2 parents 38d4f79 + 9f53122 commit 3d9ba44
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Quarrel/DataTemplates/Messages/MessageTemplate.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<TextBlock Text="{x:Bind Footer.Text, Mode=OneWay}" FontSize="12" FontWeight="SemiBold" Opacity="0.4" VerticalAlignment="Center"/>
</StackPanel>
<Button Visibility="Collapsed" Style="{StaticResource IntegratedButton}" Grid.Column="1" HorizontalAlignment="Right">
<SymbolIcon Symbol="Share"/>
<FontIcon Glyph="&#xE72D;" FontFamily="Segoe MDL2 Assets" />
</Button>
</Grid>
</StackPanel>
Expand Down
6 changes: 5 additions & 1 deletion src/Quarrel/SubPages/Settings/SettingsPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
<ctl:NavigationViewItemHeader Content="User Settings"/>
<ctl:NavigationViewItem x:Name="MyAccountItem" Icon="ContactInfo" Content="My Account"/>
<ctl:NavigationViewItem x:Name="PrivacyItem" Icon="Permissions" Content="Privacy"/>
<ctl:NavigationViewItem IsEnabled="False" x:Name="ConnectionsItem" Icon="Share" Content="Connections"/>
<ctl:NavigationViewItem IsEnabled="False" x:Name="ConnectionsItem" Content="Connections">
<ctl:NavigationViewItem.Icon>
<FontIcon Glyph="&#xE72D;" FontFamily="Segoe MDL2 Assets" />
</ctl:NavigationViewItem.Icon>
</ctl:NavigationViewItem>

<ctl:NavigationViewItemHeader Content="App Settings"/>
<ctl:NavigationViewItem x:Name="DisplayItem" Icon="View" Content="Display"/>
Expand Down

0 comments on commit 3d9ba44

Please sign in to comment.