Merge branch 'develop' into doc/fix-forum-links

MovingBlocks · May 30, 2024 · c2f494b · c2f494b
2 parents 3d1f5fb + 304d7be
commit c2f494b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/engine/src/main/resources/org/terasology/engine/assets/skins/mainmenu.skin b/engine/src/main/resources/org/terasology/engine/assets/skins/mainmenu.skin
@@ -128,6 +128,14 @@
                     "text-align-horizontal": "left"
                 }
             }
+        },
+        "button-text-field-height": {
+            "elements": {
+                "UIButton": {
+                    "min-height": 28,
+                    "max-height": 28
+                }
+            }
         }
     }
 }
diff --git a/engine/src/main/resources/org/terasology/engine/assets/ui/menu/universeSetupScreen.ui b/engine/src/main/resources/org/terasology/engine/assets/ui/menu/universeSetupScreen.ui
@@ -171,7 +171,8 @@
                   {
                     "type": "UIButton",
                     "text": "${engine:menu#re-roll}",
-                    "id": "reRoll"
+                    "id": "reRoll",
+                    "family": "button-text-field-height"
                   }
                 ]
               },