Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit ba0606c

Browse files
jcansdalejcansdale
committed
Move Markdown.xaml into GitHub.VisualStudio.UI
This depends on Visual Studio colors so should be in this assembly.
1 parent c29704a commit ba0606c

13 files changed

+14
-11
lines changed

‎src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
<SubType>Designer</SubType>
3636
<ContainsDesignTimeResources>true</ContainsDesignTimeResources>
3737
</Page>
38+
<Page Update="Styles\Markdown.xaml">
39+
<SubType>Designer</SubType>
40+
</Page>
3841
</ItemGroup>
3942

4043
</Project>

src/GitHub.UI/Assets/Markdown.xaml renamed to src/GitHub.VisualStudio.UI/Styles/Markdown.xaml

File renamed without changes.

‎src/GitHub.VisualStudio.UI/UI/Controls/InfoPanel.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ResourceDictionary>
1919
<ResourceDictionary.MergedDictionaries>
2020
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml"/>
21-
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/Assets/Markdown.xaml" />
21+
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/Markdown.xaml" />
2222
</ResourceDictionary.MergedDictionaries>
2323
<Style x:Key="DocumentStyle" TargetType="FlowDocument">
2424
<Setter Property="FontFamily" Value="Segoe UI"/>

‎src/GitHub.VisualStudio.UI/Views/Documents/CommitListView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
1414
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
1515
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
16-
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/Assets/Markdown.xaml" />
16+
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/Markdown.xaml" />
1717
<StaticResource ResourceKey="ThemedDialogDefaultStylesKey"/>
1818
</ResourceDictionary.MergedDictionaries>
1919
</ResourceDictionary>

‎src/GitHub.VisualStudio.UI/Views/Documents/IssueishCommentView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
2424
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
2525
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
26-
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/Assets/Markdown.xaml" />
26+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/Markdown.xaml" />
2727
</ResourceDictionary.MergedDictionaries>
2828

2929
<Style TargetType="Button" BasedOn="{StaticResource GitHubVsButton}"/>

‎src/GitHub.VisualStudio.UI/Views/Documents/PullRequestPageView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
2222
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
2323
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
24-
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/Assets/Markdown.xaml" />
24+
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/Markdown.xaml" />
2525
<StaticResource ResourceKey="ThemedDialogDefaultStylesKey"/>
2626
</ResourceDictionary.MergedDictionaries>
2727

‎src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestAnnotationsView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
2424
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
2525
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
26-
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/Assets/Markdown.xaml" />
26+
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/Markdown.xaml" />
2727
</ResourceDictionary.MergedDictionaries>
2828
</ResourceDictionary>
2929
</Control.Resources>

‎src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
4040
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
4141
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
42-
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/Assets/Markdown.xaml" />
42+
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/Markdown.xaml" />
4343
</ResourceDictionary.MergedDictionaries>
4444

4545
<Style x:Key="Separator" TargetType="Rectangle">

‎src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFileCommentsView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
2424
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
2525
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
26-
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/Assets/Markdown.xaml" />
26+
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/Markdown.xaml" />
2727
</ResourceDictionary.MergedDictionaries>
2828
<CollectionViewSource x:Key="FileComments" Source="{Binding}">
2929
<CollectionViewSource.GroupDescriptions>

‎src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestFilesView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
2222
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
2323
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
24-
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/Assets/Markdown.xaml" />
24+
<ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/Markdown.xaml" />
2525
<StaticResource ResourceKey="ThemedDialogDefaultStylesKey"/>
2626
</ResourceDictionary.MergedDictionaries>
2727

0 commit comments

Comments
 (0)