From e2e9333cc8edb54b4cd49ead96cd44c7be8b5207 Mon Sep 17 00:00:00 2001 From: Robert Hammerle Date: Fri, 18 Oct 2024 10:59:59 +0200 Subject: [PATCH 1/2] chore: small styling fixes --- .../Assets/Common/Scripts/NetworkManagerUI.cs | 11 ++- .../Assets/UI Toolkit/NetworkManagerUI.uxml | 8 +- .../UI Toolkit/UseCasePanelSettings.asset | 6 +- .../Assets/UI Toolkit/UseCasesStyleClass.uss | 76 ++++++++----------- 4 files changed, 43 insertions(+), 58 deletions(-) diff --git a/Basic/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs b/Basic/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs index 0e5149a18..f9a4d1286 100644 --- a/Basic/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs +++ b/Basic/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs @@ -149,19 +149,18 @@ void EnableAndHighlightButtons(Button buttonToHighlight, bool enable) void SetButtonStateAndColor(Button button, bool highlight, bool enable) { + button.SetEnabled(enable); + if (enable) { button.RemoveFromClassList("UseCaseButtonHighlight"); - button.AddToClassList("UseCaseButton"); + return; } - else + if (highlight) { - button.RemoveFromClassList("UseCaseButton"); - button.AddToClassList(highlight ? "UseCaseButtonHighlight" : "UseCaseButton"); + button.AddToClassList("UseCaseButtonHighlight"); } - - button.SetEnabled(enable); } } } diff --git a/Basic/MultiplayerUseCases/Assets/UI Toolkit/NetworkManagerUI.uxml b/Basic/MultiplayerUseCases/Assets/UI Toolkit/NetworkManagerUI.uxml index ea19ba640..1a8a44cf0 100644 --- a/Basic/MultiplayerUseCases/Assets/UI Toolkit/NetworkManagerUI.uxml +++ b/Basic/MultiplayerUseCases/Assets/UI Toolkit/NetworkManagerUI.uxml @@ -6,9 +6,9 @@ - - - - + + + + diff --git a/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasePanelSettings.asset b/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasePanelSettings.asset index 441819196..f3bff100d 100644 --- a/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasePanelSettings.asset +++ b/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasePanelSettings.asset @@ -17,14 +17,14 @@ MonoBehaviour: m_TargetTexture: {fileID: 0} m_RenderMode: 0 m_WorldSpaceLayer: 0 - m_ScaleMode: 0 + m_ScaleMode: 2 m_ReferenceSpritePixelsPerUnit: 100 m_PixelsPerUnit: 100 m_Scale: 1 m_ReferenceDpi: 96 m_FallbackDpi: 96 - m_ReferenceResolution: {x: 1200, y: 800} - m_ScreenMatchMode: 0 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 2 m_Match: 0 m_SortingOrder: 0 m_TargetDisplay: 0 diff --git a/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasesStyleClass.uss b/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasesStyleClass.uss index 00aee1ccc..c309b743a 100644 --- a/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasesStyleClass.uss +++ b/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasesStyleClass.uss @@ -1,10 +1,21 @@ +*{ + --font-size: 16px; + --text-color: rgb(250, 250, 250); + --mid-blue-color: rgb(79, 120, 168); + --mid-blue-color: rgb(79, 120, 168); + --dark-blue-color: rgb(47, 79, 112); + --light-blue-color: rgb(127, 179, 224); + --highlight-color:rgb(76, 178, 113); + --highlight-border-color:rgb(96, 225, 141); +} + .UseCaseButton { - background-color: rgb(79, 120, 168); - border-color: rgb(127, 179, 224); + background-color: var(--mid-blue-color); + border-color: var(--light-blue-color); border-width: 2px; - color: rgb(255, 255, 255); + color: var(--text-color); -unity-font: url("project://database/Assets/TextMesh%20Pro/Fonts/LiberationSans.ttf?fileID=12800000&guid=e3265ab4bf004d28a9537516768c1c75&type=3#LiberationSans"); - font-size: 12px; + font-size: var(--font-size); border-radius: 5px; margin: 4px; padding: 10px; @@ -12,60 +23,36 @@ align-self: center; justify-content: flex-start; align-items: stretch; - -unity-font-definition: none; - height: 24px; max-height: 24px; min-height: 24px; } +.UseCaseButton:disabled { + background-color: var(--dark-blue-color); + border-color: var(--light-blue-color);} + .UseCaseButton:hover { - background-color: rgb(101, 151, 210); + border-color: var(--light-blue-color); } -.UseCaseButton:disabled { - background-color: rgb(47, 79, 112); - border-color: rgb(81, 121, 164); +.UseCaseButtonHighlight { + background-color: var(--highlight-color); + border-color: var(--highlight-border-color); } -.UseCaseButtonHighlight { - background-color: rgb(76, 178, 113); - border-color: rgb(96, 225, 141); - border-width: 2px; - color: rgb(255, 255, 255); - -unity-font: url("project://database/Assets/TextMesh%20Pro/Fonts/LiberationSans.ttf?fileID=12800000&guid=e3265ab4bf004d28a9537516768c1c75&type=3#LiberationSans"); - -unity-font-style: normal; - font-size: 12px; - border-radius: 5px; - margin: 4px; - display: flex; - opacity: 1; - visibility: visible; - overflow: visible; - -unity-text-outline-width: 0; - -unity-text-outline-color: rgba(255, 255, 255, 0); - text-overflow: clip; - white-space: nowrap; - padding: 10px; - width: 100%; - height: 24px; - flex-direction: column; - align-self: center; - justify-content: flex-start; - align-items: stretch; - -unity-font-definition: none; - max-height: 24px; - min-height: 24px; +.UseCaseButtonHighlight:disabled { + background-color: var(--highlight-color); + border-color: var(--highlight-border-color); } .unity-text-field { margin: 0 0 2px; - padding: 2px; - font-size: 12px; + font-size: var(--font-size); width: 100%; height: 25px; -unity-text-align: middle-center; flex-direction: row; - border-color: rgb(127, 179, 224); + border-color: var(--light-blue-color); -unity-font: url("project://database/Assets/TextMesh%20Pro/Fonts/LiberationSans.ttf?fileID=12800000&guid=e3265ab4bf004d28a9537516768c1c75&type=3#LiberationSans"); align-self: center; } @@ -79,9 +66,8 @@ border-width: 2px; align-self: center; max-width: 245px; - -unity-font-definition: none; border-color: rgb(127, 179, 224); - font-size: 12px; + font-size: var(--font-size); } .labelText { @@ -89,8 +75,8 @@ margin: 2px; flex-direction: row; -unity-text-align: upper-center; - color: rgb(255, 255, 255); + color: var(--text-color); -unity-font: url("project://database/Assets/TextMesh%20Pro/Fonts/LiberationSans.ttf?fileID=12800000&guid=e3265ab4bf004d28a9537516768c1c75&type=3#LiberationSans"); -unity-font-style: normal; - font-size: 12px; + font-size: var(--font-size); } From bdcf175c789ca866158e2cab0695caeeecec0f1a Mon Sep 17 00:00:00 2001 From: Robert Hammerle Date: Mon, 21 Oct 2024 10:30:38 +0200 Subject: [PATCH 2/2] chore: remove inline styles --- .../Assets/UI Toolkit/NetworkManagerUI.uxml | 8 ++--- .../Assets/UI Toolkit/UseCasesStyleClass.uss | 36 ++++++++++++++++--- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/Basic/MultiplayerUseCases/Assets/UI Toolkit/NetworkManagerUI.uxml b/Basic/MultiplayerUseCases/Assets/UI Toolkit/NetworkManagerUI.uxml index 1a8a44cf0..f27a6f4c2 100644 --- a/Basic/MultiplayerUseCases/Assets/UI Toolkit/NetworkManagerUI.uxml +++ b/Basic/MultiplayerUseCases/Assets/UI Toolkit/NetworkManagerUI.uxml @@ -1,11 +1,11 @@