From ca60f4777b72b9e38b3991fe1d8d880927e5a946 Mon Sep 17 00:00:00 2001
From: Benjamin Kraft <benjamin.kraft@online.de>
Date: Mon, 17 Apr 2023 13:40:49 +0200
Subject: [PATCH] refactoring styles and ui

---
 Assets/UI.meta                                        |  8 ++++++++
 Assets/{UI Toolkit => UI}/Game.uxml                   |  0
 Assets/{UI Toolkit => UI}/Game.uxml.meta              |  0
 Assets/{UI Toolkit => UI}/Menu.uxml                   |  5 +++--
 Assets/{UI Toolkit => UI}/Menu.uxml.meta              |  0
 Assets/{UI Toolkit => UI}/PlayerUI.uxml               |  4 ++--
 Assets/{UI Toolkit => UI}/PlayerUI.uxml.meta          |  0
 Assets/UI/Styles.meta                                 |  8 ++++++++
 Assets/{UI Toolkit => UI/Styles}/game.uss             |  0
 Assets/{UI Toolkit => UI/Styles}/game.uss.meta        |  0
 Assets/UI/Styles/global.uss                           |  3 +++
 Assets/UI/Styles/global.uss.meta                      | 11 +++++++++++
 Assets/{UI Toolkit/styles.uss => UI/Styles/menu.uss}  |  5 +----
 .../styles.uss.meta => UI/Styles/menu.uss.meta}       |  0
 Assets/{UI Toolkit => UI/Styles}/player_panel.uss     |  0
 .../{UI Toolkit => UI/Styles}/player_panel.uss.meta   |  0
 README.md                                             |  1 +
 17 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 Assets/UI.meta
 rename Assets/{UI Toolkit => UI}/Game.uxml (100%)
 rename Assets/{UI Toolkit => UI}/Game.uxml.meta (100%)
 rename Assets/{UI Toolkit => UI}/Menu.uxml (75%)
 rename Assets/{UI Toolkit => UI}/Menu.uxml.meta (100%)
 rename Assets/{UI Toolkit => UI}/PlayerUI.uxml (66%)
 rename Assets/{UI Toolkit => UI}/PlayerUI.uxml.meta (100%)
 create mode 100644 Assets/UI/Styles.meta
 rename Assets/{UI Toolkit => UI/Styles}/game.uss (100%)
 rename Assets/{UI Toolkit => UI/Styles}/game.uss.meta (100%)
 create mode 100644 Assets/UI/Styles/global.uss
 create mode 100644 Assets/UI/Styles/global.uss.meta
 rename Assets/{UI Toolkit/styles.uss => UI/Styles/menu.uss} (97%)
 rename Assets/{UI Toolkit/styles.uss.meta => UI/Styles/menu.uss.meta} (100%)
 rename Assets/{UI Toolkit => UI/Styles}/player_panel.uss (100%)
 rename Assets/{UI Toolkit => UI/Styles}/player_panel.uss.meta (100%)

diff --git a/Assets/UI.meta b/Assets/UI.meta
new file mode 100644
index 0000000..cc9d832
--- /dev/null
+++ b/Assets/UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 46686cf9748bd11bcbf2f7c49bb46e7f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/UI Toolkit/Game.uxml b/Assets/UI/Game.uxml
similarity index 100%
rename from Assets/UI Toolkit/Game.uxml
rename to Assets/UI/Game.uxml
diff --git a/Assets/UI Toolkit/Game.uxml.meta b/Assets/UI/Game.uxml.meta
similarity index 100%
rename from Assets/UI Toolkit/Game.uxml.meta
rename to Assets/UI/Game.uxml.meta
diff --git a/Assets/UI Toolkit/Menu.uxml b/Assets/UI/Menu.uxml
similarity index 75%
rename from Assets/UI Toolkit/Menu.uxml
rename to Assets/UI/Menu.uxml
index 2d0a7cd..ea747a7 100644
--- a/Assets/UI Toolkit/Menu.uxml	
+++ b/Assets/UI/Menu.uxml
@@ -1,6 +1,7 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <Style src="project://database/Assets/UI%20Toolkit/styles.uss?fileID=7433441132597879392&amp;guid=a6abab2f6d20ba823bad41d2081810e9&amp;type=3#styles" />
-    <ui:Label text="Pong Remastered" display-tooltip-when-elided="true" name="top_header" class="header" />
+    <Style src="project://database/Assets/UI/Styles/menu.uss?fileID=7433441132597879392&amp;guid=a6abab2f6d20ba823bad41d2081810e9&amp;type=3#menu" />
+    <Style src="project://database/Assets/UI/Styles/global.uss?fileID=7433441132597879392&amp;guid=f6d2ff1ab9bcd826f88710e642615fa6&amp;type=3#global" />
+    <ui:Label text="Pong Reloaded" display-tooltip-when-elided="true" name="top_header" class="header" />
     <ui:VisualElement name="main_menu" class="menu" style="display: flex; visibility: visible;">
         <ui:Button text="Play" display-tooltip-when-elided="true" name="btn_play" />
         <ui:Button text="Settings" display-tooltip-when-elided="true" name="btn_settings" />
diff --git a/Assets/UI Toolkit/Menu.uxml.meta b/Assets/UI/Menu.uxml.meta
similarity index 100%
rename from Assets/UI Toolkit/Menu.uxml.meta
rename to Assets/UI/Menu.uxml.meta
diff --git a/Assets/UI Toolkit/PlayerUI.uxml b/Assets/UI/PlayerUI.uxml
similarity index 66%
rename from Assets/UI Toolkit/PlayerUI.uxml
rename to Assets/UI/PlayerUI.uxml
index 2e7fe2a..d02083f 100644
--- a/Assets/UI Toolkit/PlayerUI.uxml	
+++ b/Assets/UI/PlayerUI.uxml
@@ -1,6 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <Style src="project://database/Assets/UI%20Toolkit/styles.uss?fileID=7433441132597879392&amp;guid=a6abab2f6d20ba823bad41d2081810e9&amp;type=3#styles" />
-    <Style src="project://database/Assets/UI%20Toolkit/player_panel.uss?fileID=7433441132597879392&amp;guid=102b2cb1b84d8883abde9356b92d807e&amp;type=3#player_panel" />
+    <Style src="project://database/Assets/UI/Styles/player_panel.uss?fileID=7433441132597879392&amp;guid=102b2cb1b84d8883abde9356b92d807e&amp;type=3#player_panel" />
+    <Style src="project://database/Assets/UI/Styles/global.uss?fileID=7433441132597879392&amp;guid=f6d2ff1ab9bcd826f88710e642615fa6&amp;type=3#global" />
     <ui:Label text="←" display-tooltip-when-elided="true" name="go_left" class="go" />
     <ui:VisualElement class="mods_list" />
     <ui:Label display-tooltip-when-elided="true" name="score" binding-path="m_Score" />
diff --git a/Assets/UI Toolkit/PlayerUI.uxml.meta b/Assets/UI/PlayerUI.uxml.meta
similarity index 100%
rename from Assets/UI Toolkit/PlayerUI.uxml.meta
rename to Assets/UI/PlayerUI.uxml.meta
diff --git a/Assets/UI/Styles.meta b/Assets/UI/Styles.meta
new file mode 100644
index 0000000..9c8c6d0
--- /dev/null
+++ b/Assets/UI/Styles.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d5cea8c79a99ef547b550384d302a4e2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/UI Toolkit/game.uss b/Assets/UI/Styles/game.uss
similarity index 100%
rename from Assets/UI Toolkit/game.uss
rename to Assets/UI/Styles/game.uss
diff --git a/Assets/UI Toolkit/game.uss.meta b/Assets/UI/Styles/game.uss.meta
similarity index 100%
rename from Assets/UI Toolkit/game.uss.meta
rename to Assets/UI/Styles/game.uss.meta
diff --git a/Assets/UI/Styles/global.uss b/Assets/UI/Styles/global.uss
new file mode 100644
index 0000000..8ce8af0
--- /dev/null
+++ b/Assets/UI/Styles/global.uss
@@ -0,0 +1,3 @@
+* {
+    color: rgb(200, 200, 200);
+}
\ No newline at end of file
diff --git a/Assets/UI/Styles/global.uss.meta b/Assets/UI/Styles/global.uss.meta
new file mode 100644
index 0000000..66ffd6f
--- /dev/null
+++ b/Assets/UI/Styles/global.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f6d2ff1ab9bcd826f88710e642615fa6
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Assets/UI Toolkit/styles.uss b/Assets/UI/Styles/menu.uss
similarity index 97%
rename from Assets/UI Toolkit/styles.uss
rename to Assets/UI/Styles/menu.uss
index f7c3687..33d4293 100644
--- a/Assets/UI Toolkit/styles.uss	
+++ b/Assets/UI/Styles/menu.uss
@@ -2,10 +2,6 @@
     --background-color: rgb(80, 80, 80);
 }
 
-* {
-    color: rgb(200, 200, 200);
-}
-
 Button {
     margin-right: 10px;
     margin-top: 5px;
@@ -28,6 +24,7 @@ Button {
     border-right-width: 3px;
     border-top-width: 3px;
     border-bottom-width: 3px;
+    font-size: 25px;
 }
 
 Button:active {
diff --git a/Assets/UI Toolkit/styles.uss.meta b/Assets/UI/Styles/menu.uss.meta
similarity index 100%
rename from Assets/UI Toolkit/styles.uss.meta
rename to Assets/UI/Styles/menu.uss.meta
diff --git a/Assets/UI Toolkit/player_panel.uss b/Assets/UI/Styles/player_panel.uss
similarity index 100%
rename from Assets/UI Toolkit/player_panel.uss
rename to Assets/UI/Styles/player_panel.uss
diff --git a/Assets/UI Toolkit/player_panel.uss.meta b/Assets/UI/Styles/player_panel.uss.meta
similarity index 100%
rename from Assets/UI Toolkit/player_panel.uss.meta
rename to Assets/UI/Styles/player_panel.uss.meta
diff --git a/README.md b/README.md
index 1401f7e..8af9741 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,4 @@
 - Score number rotation
 
 ### Menu
+-