move themes to root of project to align with namespaces

jinek · Dec 5, 2024 · 450215a · 450215a
1 parent 2df0c54
commit 450215a
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 9 deletions.
diff --git a/...a.Themes/Themes/Fluent/FluentColors.axaml → ...nsolonia.Themes/Fluent/FluentColors.axaml b/...a.Themes/Themes/Fluent/FluentColors.axaml → ...nsolonia.Themes/Fluent/FluentColors.axaml
diff --git a/...ia.Themes/Themes/Fluent/FluentTheme.axaml → ...onsolonia.Themes/Fluent/FluentTheme.axaml b/...ia.Themes/Themes/Fluent/FluentTheme.axaml → ...onsolonia.Themes/Fluent/FluentTheme.axaml
@@ -7,11 +7,11 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="/Themes/Material/MaterialColors.axaml" />
+                <ResourceInclude Source="/Material/MaterialColors.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
 
     <StyleInclude Source="/Templates/Controls/AllControls.axaml" />
-    <StyleInclude Source="/Themes/TurboVisionBlack/Controls/Button.axaml" />
+    <StyleInclude Source="/TurboVisionBlack/Controls/Button.axaml" />
 </Styles>
diff --git a/src/Consolonia.Themes/Themes/FluentTheme.cs → src/Consolonia.Themes/FluentTheme.cs b/src/Consolonia.Themes/Themes/FluentTheme.cs → src/Consolonia.Themes/FluentTheme.cs
diff --git a/...emes/Themes/Material/MaterialColors.axaml → ...onia.Themes/Material/MaterialColors.axaml b/...emes/Themes/Material/MaterialColors.axaml → ...onia.Themes/Material/MaterialColors.axaml
diff --git a/...hemes/Themes/Material/MaterialTheme.axaml → ...lonia.Themes/Material/MaterialTheme.axaml b/...hemes/Themes/Material/MaterialTheme.axaml → ...lonia.Themes/Material/MaterialTheme.axaml
@@ -4,11 +4,11 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="/Themes/Material/MaterialColors.axaml" />
+                <ResourceInclude Source="/Material/MaterialColors.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
 
     <StyleInclude Source="/Templates/Controls/AllControls.axaml" />
-    <StyleInclude Source="/Themes/TurboVisionBlack/Controls/Button.axaml" />
+    <StyleInclude Source="/TurboVisionBlack/Controls/Button.axaml" />
 </Styles>
diff --git a/...Consolonia.Themes/Themes/MaterialTheme.cs → src/Consolonia.Themes/MaterialTheme.cs b/...Consolonia.Themes/Themes/MaterialTheme.cs → src/Consolonia.Themes/MaterialTheme.cs
diff --git a/...es/TurboVisionBlack/Controls/Button.axaml → ...es/TurboVisionBlack/Controls/Button.axaml b/...es/TurboVisionBlack/Controls/Button.axaml → ...es/TurboVisionBlack/Controls/Button.axaml
diff --git a/...oVisionBlack/TurboVisionBlackColors.axaml → ...oVisionBlack/TurboVisionBlackColors.axaml b/...oVisionBlack/TurboVisionBlackColors.axaml → ...oVisionBlack/TurboVisionBlackColors.axaml
diff --git a/...boVisionBlack/TurboVisionBlackTheme.axaml → ...boVisionBlack/TurboVisionBlackTheme.axaml b/...boVisionBlack/TurboVisionBlackTheme.axaml → ...boVisionBlack/TurboVisionBlackTheme.axaml
@@ -4,10 +4,10 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <MergeResourceInclude Source="/Themes/TurboVisionBlack/TurboVisionBlackColors.axaml" />
+                <MergeResourceInclude Source="/TurboVisionBlack/TurboVisionBlackColors.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
     <StyleInclude Source="/Templates/Controls/AllControls.axaml" />
-    <StyleInclude Source="/Themes/TurboVisionBlack/Controls/Button.axaml" />
+    <StyleInclude Source="/TurboVisionBlack/Controls/Button.axaml" />
 </Styles>
diff --git a/...ia.Themes/Themes/TurboVisionBlackTheme.cs → ...onsolonia.Themes/TurboVisionBlackTheme.cs b/...ia.Themes/Themes/TurboVisionBlackTheme.cs → ...onsolonia.Themes/TurboVisionBlackTheme.cs
diff --git a/...mes/TurboVisionDark/Controls/Button.axaml → ...mes/TurboVisionDark/Controls/Button.axaml b/...mes/TurboVisionDark/Controls/Button.axaml → ...mes/TurboVisionDark/Controls/Button.axaml
diff --git a/...rboVisionDark/Controls/DialogWindow.axaml → ...rboVisionDark/Controls/DialogWindow.axaml b/...rboVisionDark/Controls/DialogWindow.axaml → ...rboVisionDark/Controls/DialogWindow.axaml
diff --git a/...rboVisionDark/TurboVisionDarkColors.axaml → ...rboVisionDark/TurboVisionDarkColors.axaml b/...rboVisionDark/TurboVisionDarkColors.axaml → ...rboVisionDark/TurboVisionDarkColors.axaml
diff --git a/...urboVisionDark/TurboVisionDarkTheme.axaml → ...urboVisionDark/TurboVisionDarkTheme.axaml b/...urboVisionDark/TurboVisionDarkTheme.axaml → ...urboVisionDark/TurboVisionDarkTheme.axaml
@@ -4,12 +4,12 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <MergeResourceInclude Source="/Themes/TurboVisionDark/TurboVisionDarkColors.axaml" />
+                <MergeResourceInclude Source="/TurboVisionDark/TurboVisionDarkColors.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
 
     <StyleInclude Source="/Templates/Controls/AllControls.axaml" />
-    <StyleInclude Source="/Themes/TurboVisionDark/Controls/Button.axaml" />
-    <StyleInclude Source="/Themes/TurboVisionDark/Controls/DialogWindow.axaml" />
+    <StyleInclude Source="/TurboVisionDark/Controls/Button.axaml" />
+    <StyleInclude Source="/TurboVisionDark/Controls/DialogWindow.axaml" />
 </Styles>
diff --git a/...nia.Themes/Themes/TurboVisionDarkTheme.cs → ...Consolonia.Themes/TurboVisionDarkTheme.cs b/...nia.Themes/Themes/TurboVisionDarkTheme.cs → ...Consolonia.Themes/TurboVisionDarkTheme.cs
diff --git a/...solonia.Themes/Themes/TurboVisionTheme.cs → src/Consolonia.Themes/TurboVisionTheme.cs b/...solonia.Themes/Themes/TurboVisionTheme.cs → src/Consolonia.Themes/TurboVisionTheme.cs