Merge branch 'staging' into main · pvzm.net/game@2b31668

+5

game/Custom.css

··· 1493 1493 .credit-name { 1494 1494 text-align: left; 1495 1495 } 1496 + 1497 + #dMenu0, 1498 + #dMenu1 { 1499 + font-family: "dwarventodcraft" !important; 1500 + } 1496 1501 #dProduceZombie p { 1497 1502 margin-bottom: 12px; 1498 1503 margin-top: 9px;

+13 -15

game/UI.css

··· 393 393 #dAdventure { 394 394 position: absolute; 395 395 left: 472px; 396 - top: 80px; 396 + top: 40px; 397 397 width: 331px; 398 398 height: 146px; 399 399 cursor: url(images/interface/Pointer.cur), pointer; ··· 414 414 background: url() no-repeat; 415 415 _background: url() no-repeat; 416 416 left: 474px; 417 - top: 203px; 417 + top: 163px; 418 418 width: 313px; 419 419 height: 133px; 420 420 cursor: url(images/interface/Pointer.cur), pointer; ··· 423 423 #iSurfaceBackground .riddle { 424 424 position: absolute; 425 425 left: 478px; 426 - top: 303px; 426 + top: 263px; 427 427 width: 286px; 428 428 height: 122px; 429 429 cursor: url(images/interface/Pointer.cur), pointer; ··· 469 469 top: -260px; 470 470 width: 293px; 471 471 height: 260px; 472 - background: url(images/interface/SelectorScreen_WoodSign1_32.png) no-repeat; 473 - _background: url(images/interface/SelectorScreen_WoodSign1_32.png) no-repeat; 472 + background: url(images/interface/WoodSign2_Top.png) no-repeat; 474 473 } 475 474 476 475 #dNameDiv1 { ··· 480 479 top: 96px; 481 480 width: 291px; 482 481 height: 71px; 483 - background: url(images/interface/SelectorScreen_WoodSign2_32.png) no-repeat; 484 - _background: url(images/interface/SelectorScreen_WoodSign2_8.png) no-repeat; 482 + background: url(images/interface/WoodSign2_Accountless.png) no-repeat; 485 483 } 486 484 487 485 #dNameDiv2 { ··· 490 488 top: 136px; 491 489 width: 293px; 492 490 height: 150px; 493 - background: url(images/interface/SelectorScreen_WoodSign3_32.png) no-repeat; 494 - _background: url(images/interface/SelectorScreen_WoodSign3_8.png) no-repeat; 491 + background: url(images/interface/WoodSign2_Bottom.png) no-repeat; 495 492 overflow: hidden; 496 493 } 497 494 ··· 521 518 display: none; 522 519 } 523 520 524 - #dOptionsMenuBack { 521 + #dOptionsMenuback { 525 522 position: absolute; 526 523 text-align: center; 527 524 left: 244px; ··· 1797 1794 1798 1795 .Sunflower_trophy { 1799 1796 position: absolute; 1800 - left: 15px; 1801 - top: 310px; 1797 + left: 89px; 1798 + top: 363px; 1802 1799 width: 157px; 1803 1800 height: 269px; 1804 1801 overflow: hidden; ··· 1909 1906 } 1910 1907 1911 1908 #dOptionsMenu { 1912 - line-height: 30px; 1909 + line-height: 0; 1913 1910 position: absolute; 1914 1911 width: 98.5%; 1915 1912 height: 100%; ··· 1922 1919 color: #fff; 1923 1920 text-decoration: none; 1924 1921 font-family: Tahoma; 1925 - font-size: 20; 1922 + font-size: 20px; 1926 1923 } 1927 1924 1928 1925 #dOptionsMenu .OMd0 { ··· 1939 1936 1940 1937 #dOptionsMenu .OMd0 .OMd1 div { 1941 1938 height: 30px; 1939 + line-height: 30px; 1942 1940 } 1943 1941 1944 1942 #dOptionsMenu .OMd0 .OMd1 div label { ··· 2108 2106 #dRiddle0 .list, 2109 2107 #dMini0 .list, 2110 2108 #dMini1 .list { 2111 - margin-top: 15px; 2109 + margin-top: 11px; 2112 2110 height: 45px; 2113 2111 } 2114 2112

game/images/interface/Sunflower_trophy32.png