UI tweaks

shnok · Aug 31, 2024 · 554d88e · 554d88e
1 parent c6ec5e5
commit 554d88e
Show file tree

Hide file tree

Showing 8 changed files with 186 additions and 125 deletions.
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/Inventory/InventoryWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/Inventory/InventoryWindow.uxml
@@ -3,7 +3,7 @@
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
     <ui:Instance template="WindowTemplate" class="inventory-window" style="display: flex; position: absolute;">
         <ui:VisualElement name="ExtraHeader" class="inventory-extra-buttons">
-            <ui:Label tabindex="-1" text="(0/80)" parse-escape-sequences="true" display-tooltip-when-elided="true" name="InventoryCount" style="justify-content: flex-end; align-self: flex-end; margin-top: 0; margin-right: 2px; margin-bottom: 2px; margin-left: 0; padding-top: 0; padding-right: 0; padding-left: 0; padding-bottom: 0; color: rgb(165, 143, 113); border-left-color: rgba(0, 0, 0, 0); border-right-color: rgba(0, 0, 0, 0); border-top-color: rgba(0, 0, 0, 0); border-bottom-color: rgba(0, 0, 0, 0); border-top-width: 0; border-right-width: 0; border-bottom-width: 0; border-left-width: 0; -unity-text-outline-color: rgba(0, 0, 0, 0.6); -unity-text-outline-width: 0.1px; flex-grow: 1; -unity-text-align: middle-left; font-size: 12px;" />
+            <ui:Label tabindex="-1" text="(0/80)" parse-escape-sequences="true" display-tooltip-when-elided="true" name="InventoryCount" class="l2-color-2 inventory-count" />
             <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="Expand-Window-Button" class="btn-exp-frame expand-btn" style="margin-top: -2px; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; width: 16px; height: 16px; border-left-color: rgba(149, 149, 149, 0); border-right-color: rgba(149, 149, 149, 0); border-top-color: rgba(149, 149, 149, 0); border-bottom-color: rgba(149, 149, 149, 0);">
                 <ui:VisualElement name="ButtonBg" style="flex-grow: 0; width: 32px; height: 32px; flex-shrink: 0;" />
             </ui:Button>

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/SystemMenuWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/SystemMenuWindow.uxml
@@ -10,7 +10,7 @@
                         <ui:Label tabindex="-1" text="Restart" parse-escape-sequences="true" display-tooltip-when-elided="true" name="text" class="system-menu-row-text" />
                     </ui:GroupBox>
                 </ui:Button>
-                <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="ExitRow" class="restart-btn system-menu-row">
+                <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="ExitRow" class="system-menu-row exit-btn">
                     <ui:VisualElement name="Bg" class="system-menu-button-bg" />
                     <ui:GroupBox name="Content" class="system-menu-button-content">
                         <ui:VisualElement name="icon" class="system-menu-row-icon" style="background-image: resource(&apos;Data/UI/Assets/Menu/icon_power_menu&apos;);" />

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss
@@ -3309,3 +3309,59 @@
     left: auto;
     right: 30px;
 }
+
+.frame_df_hor_large_tile {
+    background-image: none;
+}
+
+.frame_df_hor_large_tile_bg {
+    flex-grow: 1;
+    width: 104%;
+    margin-left: -2%;
+    background-image: resource('Data/UI/Assets/Frame/Frame_DF_Hor_Large/Frame_DF_Hor_Large_Tile');
+}
+
+.text-color-3 {
+}
+
+.l2-color-1 {
+    color: rgb(175, 152, 120);
+}
+
+.l2-color-2 {
+    color: rgb(176, 155, 121);
+}
+
+.l2-color-3 {
+    color: rgb(170, 170, 170);
+}
+
+.l2-color-4 {
+    color: rgb(220, 220, 220);
+}
+
+.inventory-count {
+    justify-content: flex-end;
+    align-self: flex-end;
+    margin-top: 0;
+    margin-right: 2px;
+    margin-bottom: 2px;
+    margin-left: 0;
+    padding-top: 0;
+    padding-right: 0;
+    padding-left: 0;
+    padding-bottom: 0;
+    border-left-color: rgba(0, 0, 0, 0);
+    border-right-color: rgba(0, 0, 0, 0);
+    border-top-color: rgba(0, 0, 0, 0);
+    border-bottom-color: rgba(0, 0, 0, 0);
+    border-top-width: 0;
+    border-right-width: 0;
+    border-bottom-width: 0;
+    border-left-width: 0;
+    -unity-text-outline-color: rgba(0, 0, 0, 0.6);
+    -unity-text-outline-width: 0.1px;
+    flex-grow: 1;
+    -unity-text-align: middle-left;
+    font-size: 12px;
+}
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Template/WindowTemplate.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Template/WindowTemplate.uxml
@@ -3,17 +3,23 @@
     <ui:GroupBox name="Windows" class="window-template">
         <ui:GroupBox name="Header" class="window-template-header">
             <ui:VisualElement name="Frame_DF_Hor_Large_Left" class="frame_df_hor_large_left" />
-            <ui:VisualElement name="Frame_DF_How_Large_Tile" class="frame_df_hor_large_tile" />
+            <ui:VisualElement name="Frame_DF_How_Large_Tile" class="frame_df_hor_large_tile">
+                <ui:VisualElement name="Bg" class="frame_df_hor_large_tile_bg" />
+            </ui:VisualElement>
             <ui:VisualElement name="Frame_DF_Hor_Large_Center" class="frame_df_hor_large_center" />
-            <ui:VisualElement name="Frame_DF_How_Large_Tile" class="frame_df_hor_large_tile" />
+            <ui:VisualElement name="Frame_DF_How_Large_Tile" class="frame_df_hor_large_tile">
+                <ui:VisualElement name="Bg" class="frame_df_hor_large_tile_bg" />
+            </ui:VisualElement>
             <ui:VisualElement name="Frame_DF_Hor_Large_Right" class="frame_df_hor_large_right" />
             <ui:VisualElement name="DragArea" class="drag-area window-template-drag-area">
-                <ui:Label tabindex="-1" text="Window" parse-escape-sequences="true" display-tooltip-when-elided="true" name="windows-name-label" class="windows-name-label" />
+                <ui:Label tabindex="-1" text="Window" parse-escape-sequences="true" display-tooltip-when-elided="true" name="windows-name-label" class="windows-name-label l2-color-4" />
                 <ui:GroupBox name="HeaderButtons" class="windows-header-buttons">
                     <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="Close-Window-Button" class="btn-close-frame close-btn" />
                 </ui:GroupBox>
             </ui:VisualElement>
         </ui:GroupBox>
-        <ui:VisualElement name="Content" class="windows-template-content" />
+        <ui:VisualElement name="Content" class="windows-template-content">
+            <ui:VisualElement name="Content" class="windows-template-content" />
+        </ui:VisualElement>
     </ui:GroupBox>
 </ui:UXML>