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

Commit 9c8daef

Browse files
shanashana
committed
Move theme colors to VisualStudio.UI
1 parent f989fbd commit 9c8daef

File tree

9 files changed

+35
-21
lines changed

9 files changed

+35
-21
lines changed

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,30 @@
112112
</Compile>
113113
</ItemGroup>
114114
<ItemGroup>
115+
<Page Include="SharedDictionary.xaml">
116+
<Generator>MSBuild:Compile</Generator>
117+
<SubType>Designer</SubType>
118+
</Page>
119+
<Page Include="Styles\ThemeBlue.xaml">
120+
<Generator>MSBuild:Compile</Generator>
121+
<SubType>Designer</SubType>
122+
</Page>
123+
<Page Include="Styles\ThemeDark.xaml">
124+
<Generator>MSBuild:Compile</Generator>
125+
<SubType>Designer</SubType>
126+
</Page>
127+
<Page Include="Styles\ThemeDesignTime.xaml">
128+
<Generator>MSBuild:Compile</Generator>
129+
<SubType>Designer</SubType>
130+
</Page>
131+
<Page Include="Styles\ThemeLight.xaml">
132+
<Generator>MSBuild:Compile</Generator>
133+
<SubType>Designer</SubType>
134+
</Page>
135+
<Page Include="Styles\VsBrush.xaml">
136+
<Generator>MSBuild:Compile</Generator>
137+
<SubType>Designer</SubType>
138+
</Page>
115139
<Page Include="UI\Controls\InfoPanel.xaml">
116140
<Generator>MSBuild:Compile</Generator>
117141
<SubType>Designer</SubType>

‎src/GitHub.VisualStudio.UI/SharedDictionary.xaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
4+
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers">
5+
6+
<ResourceDictionary.MergedDictionaries>
7+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ThemeDesignTime.xaml"/>
8+
</ResourceDictionary.MergedDictionaries>
9+
10+
</ResourceDictionary>

src/GitHub.VisualStudio/Styles/ThemeBlue.xaml renamed to src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml

File renamed without changes.

src/GitHub.VisualStudio/Styles/ThemeDark.xaml renamed to src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml

File renamed without changes.

src/GitHub.VisualStudio/Styles/ThemeDesignTime.xaml renamed to src/GitHub.VisualStudio.UI/Styles/ThemeDesignTime.xaml

File renamed without changes.

src/GitHub.VisualStudio/Styles/ThemeLight.xaml renamed to src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml

File renamed without changes.

src/GitHub.VisualStudio/Styles/VsBrush.xaml renamed to src/GitHub.VisualStudio.UI/Styles/VsBrush.xaml

File renamed without changes.

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -398,18 +398,6 @@
398398
<SubType>Designer</SubType>
399399
<Generator>MSBuild:Compile</Generator>
400400
</Page>
401-
<Page Include="Styles\ThemeBlue.xaml">
402-
<Generator>MSBuild:Compile</Generator>
403-
<SubType>Designer</SubType>
404-
</Page>
405-
<Page Include="Styles\ThemeDesignTime.xaml">
406-
<Generator>MSBuild:Compile</Generator>
407-
<SubType>Designer</SubType>
408-
</Page>
409-
<Page Include="Styles\ThemeLight.xaml">
410-
<Generator>MSBuild:Compile</Generator>
411-
<SubType>Designer</SubType>
412-
</Page>
413401
<Page Include="UI\Views\Controls\GistCreationControl.xaml">
414402
<SubType>Designer</SubType>
415403
<Generator>MSBuild:Compile</Generator>
@@ -422,17 +410,9 @@
422410
<SubType>Designer</SubType>
423411
<Generator>MSBuild:Compile</Generator>
424412
</Page>
425-
<Page Include="Styles\ThemeDark.xaml">
426-
<Generator>MSBuild:Compile</Generator>
427-
<SubType>Designer</SubType>
428-
</Page>
429413
<Page Include="SharedDictionary.xaml">
430414
<Generator>MSBuild:Compile</Generator>
431415
</Page>
432-
<Page Include="Styles\VsBrush.xaml">
433-
<Generator>MSBuild:Compile</Generator>
434-
<SubType>Designer</SubType>
435-
</Page>
436416
<Page Include="UI\Settings\OptionsControl.xaml">
437417
<SubType>Designer</SubType>
438418
<Generator>MSBuild:Compile</Generator>

‎src/GitHub.VisualStudio/SharedDictionary.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers">
77

88
<ResourceDictionary.MergedDictionaries>
9-
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ThemeDesignTime.xaml"/>
9+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
1010
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ActionLinkButton.xaml" />
1111
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/GitHubComboBox.xaml" />
1212
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/Buttons.xaml" />

0 commit comments

Comments
 (0)