Skip to content

Commit dd25d54

Browse files
retailcoderretailcoder
committed
revert 49d8d42 
1 parent 5ee8893 commit dd25d54

File tree

1 file changed

+75
-37
lines changed

1 file changed

+75
-37
lines changed

‎Rubberduck.Core/UI/About/AboutControl.xaml‎

Lines changed: 75 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,30 @@
1919
<Setter Property="FontFamily" Value="Segoe UI" />
2020
<Setter Property="FontSize" Value="11" />
2121
<Setter Property="FontWeight" Value="Normal" />
22-
<Setter Property="Foreground" Value="{ DynamicResource {x:Static SystemColors.ControlTextBrush}}" />
22+
<Setter Property="Foreground" Value="{x:Static SystemColors.ControlTextBrush}" />
2323
</Style.Setters>
2424
</Style>
2525
<Style x:Key="SubtleLabel" TargetType="TextBlock">
2626
<Style.Setters>
2727
<Setter Property="FontFamily" Value="Segoe UI" />
2828
<Setter Property="FontSize" Value="11" />
2929
<Setter Property="FontWeight" Value="Thin" />
30-
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrush}}" />
30+
<Setter Property="Foreground" Value="{x:Static SystemColors.GrayTextBrush}" />
3131
</Style.Setters>
3232
</Style>
3333
<Style x:Key="HeadingLabel" TargetType="TextBlock">
3434
<Style.Setters>
3535
<Setter Property="FontFamily" Value="Segoe UI" />
3636
<Setter Property="FontSize" Value="14" />
3737
<Setter Property="FontWeight" Value="Bold" />
38-
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrush}}" />
38+
<Setter Property="Foreground" Value="{x:Static SystemColors.ControlTextBrush}" />
3939
</Style.Setters>
4040
</Style>
4141
<Style x:Key="SectionBorder" TargetType="Border">
4242
<Style.Setters>
43-
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrush}}" />
44-
<Setter Property="BorderBrush" Value="Black" />
45-
<Setter Property="BorderThickness" Value="1" />
43+
<Setter Property="Background" Value="{x:Static SystemColors.ControlBrush}" />
44+
<Setter Property="BorderBrush" Value="{x:Static SystemColors.HighlightBrush}" />
45+
<Setter Property="BorderThickness" Value="2" />
4646
<Setter Property="CornerRadius" Value="8" />
4747
<Setter Property="Margin" Value="10,0" />
4848
<Setter Property="Padding" Value="2" />
@@ -64,8 +64,11 @@
6464
</Style>
6565
</ResourceDictionary>
6666
</UserControl.Resources>
67-
68-
<Grid>
67+
<Grid Background="{x:Static SystemColors.WindowBrush}">
68+
<Grid.ColumnDefinitions>
69+
<ColumnDefinition Width="*" MinWidth="250"/>
70+
<ColumnDefinition Width="*" MinWidth="250"/>
71+
</Grid.ColumnDefinitions>
6972
<Grid.RowDefinitions>
7073
<RowDefinition Height="Auto"/>
7174
<RowDefinition Height="Auto"/>
@@ -107,38 +110,73 @@
107110
</TextBlock>
108111
</StackPanel>
109112

110-
<TextBlock Grid.Row="1" TextAlignment="Center">
111-
<StackPanel Orientation="Vertical" Margin="10">
112-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_FoundAnIssue}"
113-
Style="{StaticResource HeadingLabel}"/>
114-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_HelpImproveRubberduck}"
115-
Style="{StaticResource NormalLabel}"/>
116-
<Border Style="{StaticResource ReportButtonBorder}">
117-
<TextBlock>
118-
<Hyperlink Name="GitHubIssueUrl" NavigateUri="https://github.com/rubberduck-vba/Rubberduck/issues/new/choose" TextDecorations="{x:Null}"
119-
Command="{Binding UriCommand}" CommandParameter="{Binding ElementName=GitHubIssueUrl, Path=NavigateUri}">
120-
<Label Height="40" Foreground="{StaticResource CaptionLightBrush}" FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
121-
VerticalContentAlignment="Center" HorizontalContentAlignment="Stretch"
122-
Content="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_ReportAnIssue}"/>
123-
</Hyperlink>
124-
</TextBlock>
125-
</Border>
126-
<TextBlock HorizontalAlignment="Center" Style="{StaticResource SubtleLabel}">
127-
<Hyperlink Name="WebpageHyperlink"
128-
Command="{Binding UriCommand}"
129-
CommandParameter="{Binding ElementName=WebpageHyperlink, Path=NavigateUri}"
130-
NavigateUri="http://rubberduckvba.com/">rubberduckvba.com
113+
<TextBlock Grid.Column="0" Grid.Row="2" TextAlignment="Center">
114+
<StackPanel Orientation="Vertical" Margin="10">
115+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_FoundAnIssue}"
116+
Style="{StaticResource HeadingLabel}"/>
117+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_HelpImproveRubberduck}"
118+
Style="{StaticResource NormalLabel}"/>
119+
<Border Style="{StaticResource ReportButtonBorder}">
120+
<TextBlock>
121+
<Hyperlink Name="GitHubIssueUrl"
122+
NavigateUri="https://github.com/rubberduck-vba/Rubberduck/issues/new/choose"
123+
TextDecorations="{x:Null}"
124+
Command="{Binding UriCommand}" CommandParameter="{Binding ElementName=GitHubIssueUrl, Path=NavigateUri}">
125+
<Label Height="40" Foreground="{StaticResource CaptionLightBrush}" FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
126+
VerticalContentAlignment="Center" HorizontalContentAlignment="Stretch"
127+
Content="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_ReportAnIssue}"/>
131128
</Hyperlink>
132129
</TextBlock>
130+
</Border>
131+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_FindRubberduckAt}"
132+
Style="{StaticResource NormalLabel}" Margin="0,5"/>
133+
<StackPanel HorizontalAlignment="Center"
134+
Orientation="Horizontal">
135+
<!-- Circle logos created with Ai->XAML Export Plug-In Version 0.2 (PC/64) -->
136+
<!-- By Mike Swanson (http://blog.mikeswanson.com/) -->
137+
<TextBlock Margin="10,5" TextAlignment="Center" HorizontalAlignment="Center">
138+
<Hyperlink Name="GitHubUrl"
139+
NavigateUri="https://github.com/rubberduck-vba/Rubberduck"
140+
Command="{Binding UriCommand}"
141+
CommandParameter="{Binding ElementName=GitHubUrl, Path=NavigateUri}"
142+
TextDecorations="{x:Null}">
143+
<Border Background="Transparent">
144+
<Path Stretch="Fill" Fill="{x:Static SystemColors.ControlDarkDarkBrush}" Width="25" Height="25"
145+
Data=" M 59.996,0.000 C 26.866,0.000 0.000,26.863 0.000,60.003 C 0.000,86.510 17.190,108.999 41.035,116.934 C 44.035,117.484 45.130,115.632 45.130,114.041 C 45.130,112.617 45.078,108.844 45.049,103.837 C 28.359,107.463 24.837,95.794 24.837,95.794 C 22.109,88.862 18.175,87.017 18.175,87.017 C 12.728,83.294 18.588,83.370 18.588,83.370 C 24.609,83.794 27.778,89.553 27.778,89.553 C 33.130,98.722 41.821,96.074 45.240,94.539 C 45.785,90.661 47.335,88.017 49.049,86.517 C 35.725,85.003 21.719,79.856 21.719,56.863 C 21.719,50.313 24.057,44.957 27.895,40.763 C 27.278,39.245 25.219,33.145 28.483,24.884 C 28.483,24.884 33.521,23.271 44.982,31.035 C 49.768,29.704 54.901,29.039 60.003,29.016 C 65.099,29.039 70.232,29.704 75.025,31.035 C 86.479,23.271 91.508,24.884 91.508,24.884 C 94.781,33.145 92.722,39.245 92.105,40.763 C 95.950,44.957 98.272,50.313 98.272,56.863 C 98.272,79.913 84.244,84.985 70.877,86.471 C 73.032,88.323 74.951,91.985 74.951,97.582 C 74.951,105.603 74.877,112.074 74.877,114.041 C 74.877,115.646 75.958,117.513 79.003,116.927 C 102.824,108.977 120.000,86.503 120.000,60.003 C 120.000,26.863 93.134,0.000 59.996,0.000 Z"/>
146+
</Border>
147+
</Hyperlink>
148+
</TextBlock>
149+
<!--<TextBlock Text="GitHub" FontSize="9" TextAlignment="Center" />-->
150+
<TextBlock Margin="10,5" TextAlignment="Center" HorizontalAlignment="Center">
151+
<Hyperlink Name="TwitterUrl"
152+
NavigateUri="http://www.twitter.com/rubberduckvba"
153+
Command="{Binding UriCommand}"
154+
CommandParameter="{Binding ElementName=TwitterUrl, Path=NavigateUri}"
155+
TextDecorations="{x:Null}">
156+
<Border Background="Transparent">
157+
<Path Stretch="Fill" Fill="{x:Static SystemColors.ControlDarkDarkBrush}" Width="25" Height="25"
158+
Data="F1 M 92.670,42.747 C 92.702,43.460 92.718,44.177 92.718,44.897 C 92.718,66.860 76.001,92.185 45.431,92.185 C 36.045,92.185 27.310,89.433 19.954,84.718 C 21.255,84.871 22.577,84.950 23.919,84.950 C 31.706,84.950 38.872,82.293 44.560,77.836 C 37.287,77.701 31.149,72.896 29.034,66.293 C 30.049,66.487 31.090,66.591 32.161,66.591 C 33.677,66.591 35.145,66.388 36.540,66.009 C 28.937,64.482 23.208,57.765 23.208,49.712 C 23.208,49.642 23.208,49.572 23.209,49.503 C 25.450,50.748 28.013,51.496 30.737,51.582 C 26.278,48.601 23.344,43.514 23.344,37.748 C 23.344,34.703 24.163,31.848 25.594,29.393 C 33.791,39.448 46.037,46.065 59.850,46.758 C 59.567,45.541 59.420,44.273 59.420,42.970 C 59.420,33.792 66.861,26.351 76.040,26.351 C 80.820,26.351 85.139,28.369 88.171,31.599 C 91.957,30.854 95.514,29.471 98.725,27.566 C 97.484,31.447 94.849,34.704 91.417,36.761 C 94.779,36.359 97.982,35.466 100.963,34.144 C 98.735,37.477 95.917,40.404 92.670,42.747 Z M 60.000,0.000 C 26.863,0.000 0.000,26.863 0.000,60.000 C 0.000,93.137 26.863,120.000 60.000,120.000 C 93.137,120.000 120.000,93.137 120.000,60.000 C 120.000,26.863 93.137,0.000 60.000,0.000 Z"/>
159+
</Border>
160+
</Hyperlink>
161+
</TextBlock>
162+
<!--<TextBlock Text="Twitter" FontSize="9" TextAlignment="Center" />-->
133163
</StackPanel>
134-
</TextBlock>
135-
136-
<ScrollViewer Grid.Row="0" Grid.RowSpan="2" Grid.Column="1" Margin="5" Height="360" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
137-
<StackPanel VerticalAlignment="Top">
138-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_AttributionsLabel}"
139-
Style="{StaticResource HeadingLabel}" />
140-
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_AttributionList}"
141-
Style="{StaticResource NormalLabel}" Margin="5" />
164+
<TextBlock HorizontalAlignment="Center" Style="{StaticResource SubtleLabel}">
165+
<Hyperlink Name="WebpageHyperlink"
166+
Command="{Binding UriCommand}"
167+
CommandParameter="{Binding ElementName=WebpageHyperlink, Path=NavigateUri}"
168+
NavigateUri="http://rubberduckvba.com/">rubberduckvba.com</Hyperlink>
169+
</TextBlock>
170+
</StackPanel>
171+
</TextBlock>
172+
</Border>
173+
<Border Grid.Row="1" Grid.Column="1" Grid.RowSpan="2" Style="{StaticResource SectionBorder}">
174+
<ScrollViewer Margin="5" Height="360" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
175+
<StackPanel VerticalAlignment="Top">
176+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_AttributionsLabel}"
177+
Style="{StaticResource HeadingLabel}" />
178+
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_AttributionList}"
179+
Style="{StaticResource NormalLabel}" Margin="5" />
142180

143181
<TextBlock Text="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_SpecialThanksLabel}"
144182
Style="{StaticResource HeadingLabel}" Margin="0,5" />

0 commit comments

Comments
 (0)