From 1800ead5d0dedf852155329f901890cd656ee16a Mon Sep 17 00:00:00 2001 From: Khafra Date: Wed, 10 Jan 2024 18:53:03 -0500 Subject: [PATCH 1/4] mobile css --- SynergismMobile.css | 47 +++++++++++++++++++++++++++++++++++++++++++++ index.html | 2 ++ 2 files changed, 49 insertions(+) create mode 100644 SynergismMobile.css diff --git a/SynergismMobile.css b/SynergismMobile.css new file mode 100644 index 000000000..d6ff6ff1f --- /dev/null +++ b/SynergismMobile.css @@ -0,0 +1,47 @@ +@media screen and (max-width: 767px) { + .buttonRow > div:not(.buildingSpacer) { + display: grid; + grid-template-columns: 1.5em 15em 4.5em; + grid-template-rows: auto; + grid-template-areas: + "header header header" + "img rsrc rsrc" + "cost cost autobuy"; + border: 2px solid gold; + border-radius: 5px; + padding-bottom: 5px; + } + + .buttonRow > div > img { + grid-area: img; + padding-left: 5px; + } + + .buttonRow > div > span.desc { + grid-area: rsrc; + width: 100%; + text-align: center; + } + + .buttonRow > div > span.stats { + grid-area: header; + width: 100%; + text-align: center; + border-bottom: 2px solid gold; + padding-top: 5px; + padding-bottom: 5px; + } + + .buttonRow > div > button.buildingPurchaseBtn { + grid-area: cost; + align-self: center; + margin: 5px 0 0 5px; + } + + .buttonRow > div > button[id^="toggle"] { + grid-area: autobuy; + min-width: initial; + width: initial; + margin-right: 5px; + } +} diff --git a/index.html b/index.html index 72ab391f6..d1d52328c 100644 --- a/index.html +++ b/index.html @@ -15,6 +15,8 @@ + + Synergism From 667206de36eb19d9de0ef1c71093668fa5701768 Mon Sep 17 00:00:00 2001 From: awWhy <107661324+awWhy@users.noreply.github.com> Date: Fri, 12 Jan 2024 02:01:03 +0300 Subject: [PATCH 2/4] First 5 coin buildings (#582) Need to: - Move all coinBuildings into class buildingMainContainer - Finish toggles - Ignore click events on buttons, add event to container - Finish reset buildings - Test if any unlock classes like coinunlock1 don't have natural display block --- Synergism.css | 6 ++-- SynergismMobile.css | 76 +++++++++++++++++++++++++------------------- index.html | 32 ++++++++++++------- src/UpdateHTML.ts | 8 ++--- src/UpdateVisuals.ts | 6 ++-- translations/en.json | 10 +++--- 6 files changed, 79 insertions(+), 59 deletions(-) diff --git a/Synergism.css b/Synergism.css index f4f747169..b95c5ae00 100644 --- a/Synergism.css +++ b/Synergism.css @@ -692,7 +692,7 @@ button.isEvent:hover { text-align: center; } -#coinBuildings { +.buildingMainContainer { display: flex; position: relative; padding: 0; @@ -702,7 +702,7 @@ button.isEvent:hover { margin: 0 auto; } -#coinBuildings p { +#buildingtext p { margin: 0; } @@ -3812,3 +3812,5 @@ form input:hover { background-color: var(--hover-color); cursor: pointer; } + +.mobileShow { display: none; } diff --git a/SynergismMobile.css b/SynergismMobile.css index d6ff6ff1f..ff760471d 100644 --- a/SynergismMobile.css +++ b/SynergismMobile.css @@ -1,47 +1,57 @@ @media screen and (max-width: 767px) { + .mobileShow { display: unset; } + .mobileHide { display: none; } + + .buttonRow { row-gap: 6px; } + .buttonRow > div:not(.buildingSpacer) { display: grid; - grid-template-columns: 1.5em 15em 4.5em; - grid-template-rows: auto; - grid-template-areas: - "header header header" - "img rsrc rsrc" - "cost cost autobuy"; - border: 2px solid gold; - border-radius: 5px; - padding-bottom: 5px; - } - - .buttonRow > div > img { - grid-area: img; - padding-left: 5px; + grid-template-columns: 32px; + grid-template-areas: + "img name toggle" + "total total toggle" + "coins coins toggle" + "cost cost toggle"; + align-items: center; + border: 2px solid #ffa800; + border-radius: 8px; + padding: 8px 12px 12px; + gap: 8px 2px; } - .buttonRow > div > span.desc { - grid-area: rsrc; - width: 100%; - text-align: center; + .buttonRow > div > .desc > span:first-of-type { + grid-area: name; + font-size: 1.4em; } - .buttonRow > div > span.stats { - grid-area: header; - width: 100%; - text-align: center; - border-bottom: 2px solid gold; - padding-top: 5px; - padding-bottom: 5px; + .buttonRow > div > .desc > span:last-of-type { + grid-area: total; + line-height: 1em; } - .buttonRow > div > button.buildingPurchaseBtn { + .buttonRow > div > .buildingPurchaseBtn { grid-area: cost; - align-self: center; - margin: 5px 0 0 5px; + text-align: start; + color: gold; + background-color: unset; + font-size: min(1em, 20px); + width: unset; + min-height: unset; + border: none; + padding: 0; + line-height: 1em; } - .buttonRow > div > button[id^="toggle"] { - grid-area: autobuy; - min-width: initial; - width: initial; - margin-right: 5px; + .buttonRow > div > .auto { + grid-area: toggle; + border: none !important; + height: 90%; + border-radius: 8px; } + + .buttonRow > div > img { grid-area: img; } + .buttonRow > div > .stats { grid-area: coins; } + + .buttonRow > div > .desc { display: contents; } + /* .buttonRow > div > .stats { line-height: 1em; } */ } diff --git a/index.html b/index.html index d1d52328c..9c9197f2a 100644 --- a/index.html +++ b/index.html @@ -237,7 +237,7 @@ -
+
@@ -251,43 +251,53 @@
- +
Worker - + + Total: +
Investment - + + Total: + 0
Printer - + + Total: +
Coin Mint - + + Total: +
Alchemy - + + Total: + diff --git a/src/UpdateHTML.ts b/src/UpdateHTML.ts index ac255e807..e073a003a 100644 --- a/src/UpdateHTML.ts +++ b/src/UpdateHTML.ts @@ -32,22 +32,22 @@ import { Globals as G } from './Variables' export const revealStuff = () => { const example = document.getElementsByClassName('coinunlock1') as HTMLCollectionOf for (let i = 0; i < example.length; i++) { - example[i].style.display = player.unlocks.coinone ? 'block' : 'none' + example[i].style.display = player.unlocks.coinone ? '' : 'none' } const example2 = document.getElementsByClassName('coinunlock2') as HTMLCollectionOf for (let i = 0; i < example2.length; i++) { - example2[i].style.display = player.unlocks.cointwo ? 'block' : 'none' + example2[i].style.display = player.unlocks.cointwo ? '' : 'none' } const example3 = document.getElementsByClassName('coinunlock3') as HTMLCollectionOf for (let i = 0; i < example3.length; i++) { - example3[i].style.display = player.unlocks.cointhree ? 'block' : 'none' + example3[i].style.display = player.unlocks.cointhree ? '' : 'none' } const example4 = document.getElementsByClassName('coinunlock4') as HTMLCollectionOf for (let i = 0; i < example4.length; i++) { - example4[i].style.display = player.unlocks.coinfour ? 'block' : 'none' + example4[i].style.display = player.unlocks.coinfour ? '' : 'none' } const example5 = document.getElementsByClassName('prestigeunlock') as HTMLCollectionOf diff --git a/src/UpdateVisuals.ts b/src/UpdateVisuals.ts index a567e66ba..bd5a2e536 100644 --- a/src/UpdateVisuals.ts +++ b/src/UpdateVisuals.ts @@ -61,10 +61,8 @@ export const visualUpdateBuildings = () => { const place = G[upper[i - 1]] const ith = G.ordinals[i - 1 as ZeroToFour] - DOMCacheGetOrSet(`buildtext${2 * i - 1}`).textContent = i18next.t(`buildings.names.${names[i]}`, { - amount: format(player[`${ith}OwnedCoin` as const], 0, true), - gain: format(player[`${ith}GeneratedCoin` as const]) - }) + DOMCacheGetOrSet(`buildname${i}`).textContent = i18next.t(`buildings.names.${names[i]}`) + DOMCacheGetOrSet(`buildtext${2 * i - 1}`).textContent = `${format(player[`${ith}OwnedCoin` as const], 0, true)} ${format(player[`${ith}GeneratedCoin` as const])}` DOMCacheGetOrSet(`buycoin${i}`).textContent = i18next.t('buildings.costCoins', { coins: format(player[`${ith}CostCoin` as const]) diff --git a/translations/en.json b/translations/en.json index 97b243a17..9db88c7ed 100644 --- a/translations/en.json +++ b/translations/en.json @@ -2585,11 +2585,11 @@ "costCoins": "Cost: {{coins}} coins.", "costDiamonds": "Cost: {{diamonds}} Diamonds.", "names": { - "workers": "Workers: {{amount}} [+{{gain}}]", - "investments": "Investments: {{amount}} [+{{gain}}]", - "printers": "Printers: {{amount}} [+{{gain}}]", - "coinMints": "Coin Mints: {{amount}} [+{{gain}}]", - "alchemies": "Alchemies: {{amount}} [+{{gain}}]", + "workers": "Workers", + "investments": "Investments", + "printers": "Printers", + "coinMints": "Coin Mints", + "alchemies": "Alchemies", "accelerators": "Accelerators: {{amount}} [+{{gain}}]", "multipliers": "Multipliers: {{amount}} [+{{gain}}]", "acceleratorBoost": "Accelerator Boost: {{amount}} [+{{gain}}]", From 6f3801b04b98c3d67c7a78c3f1b2c8e166ccad71 Mon Sep 17 00:00:00 2001 From: awWhy <107661324+awWhy@users.noreply.github.com> Date: Sat, 13 Jan 2024 07:27:10 +0300 Subject: [PATCH 3/4] Finish most of buildings (#583) * More work on first 5 * Rest of buildings Subtabs and auto toggles are next * Toggles and images Left to do: - Click event - Subtabs - Surrounding text, select toggles * Finish buildings tab Outside of click events (requires extra JS events), subtabs (requires subtab alternative for translations) --- Pictures/Legacy/Accelerator.png | Bin 388 -> 389 bytes Pictures/Legacy/DiamondTier1.png | Bin 419 -> 422 bytes Pictures/Legacy/DiamondTier2.png | Bin 442 -> 455 bytes Pictures/Legacy/DiamondTier3.png | Bin 409 -> 421 bytes Pictures/Legacy/DiamondTier4.png | Bin 387 -> 387 bytes Pictures/Legacy/DiamondTier5.png | Bin 404 -> 408 bytes Pictures/Legacy/Multiplier.png | Bin 416 -> 428 bytes Pictures/Legacy/MythosTier1.png | Bin 383 -> 391 bytes Pictures/Legacy/MythosTier2.png | Bin 406 -> 416 bytes Pictures/Legacy/MythosTier3.png | Bin 373 -> 369 bytes Pictures/Legacy/MythosTier4.png | Bin 495 -> 499 bytes Pictures/Legacy/MythosTier5.png | Bin 426 -> 418 bytes Pictures/Legacy/ParticlesTier1.png | Bin 641 -> 663 bytes Pictures/Legacy/ParticlesTier2.png | Bin 370 -> 372 bytes Pictures/Legacy/ParticlesTier3.png | Bin 584 -> 609 bytes Pictures/Legacy/ParticlesTier4.png | Bin 627 -> 658 bytes Pictures/Legacy/ParticlesTier5.png | Bin 679 -> 655 bytes Pictures/Legacy/TesseractTier1.png | Bin 255 -> 260 bytes Pictures/Legacy/TesseractTier2.png | Bin 348 -> 352 bytes Pictures/Legacy/TesseractTier3.png | Bin 340 -> 339 bytes Pictures/Legacy/TesseractTier4.png | Bin 488 -> 480 bytes Pictures/Legacy/TesseractTier5.png | Bin 298 -> 302 bytes Pictures/Legacy/Tier1.png | Bin 290 -> 293 bytes Pictures/Legacy/Tier2.png | Bin 322 -> 325 bytes Pictures/Legacy/Tier3.png | Bin 324 -> 324 bytes Pictures/Legacy/Tier4.png | Bin 371 -> 367 bytes Pictures/Legacy/Tier5.png | Bin 374 -> 378 bytes Synergism.css | 102 ++++--- SynergismMobile.css | 125 ++++++++- index.html | 420 +++++++++++++++-------------- src/Themes.ts | 1 + src/Toggles.ts | 23 +- src/UpdateHTML.ts | 105 ++++---- src/UpdateVisuals.ts | 55 ++-- translations/da.json | 62 ++--- translations/de.json | 62 ++--- translations/en.json | 52 ++-- translations/es.json | 62 ++--- translations/fr.json | 62 ++--- translations/kaa.json | 62 ++--- translations/nl.json | 62 ++--- translations/pl.json | 62 ++--- translations/pt.json | 62 ++--- translations/ru.json | 62 ++--- translations/source.json | 62 ++--- translations/zh.json | 62 ++--- 46 files changed, 865 insertions(+), 700 deletions(-) diff --git a/Pictures/Legacy/Accelerator.png b/Pictures/Legacy/Accelerator.png index 0af7026b2e0db4b40b8bc6d05caebbb6a3fc9003..7fb82120f52d3f0078b24bbdf5c51ef648782514 100644 GIT binary patch delta 312 zcmV-80muG?1BC;SR(~2vL_t(oN9~s}4uUWgh5-+tVekYd8n5N5lNaCuZmwR-XyOHQ zK%I>se|c@%61AjYgO|k`9aUnG> zqPJjCY2kE#VneV#)&pp=->};PF0q-i2baj_6ZUkGuwIIuI6K#XvSo@I=slB>eGuVL4UOxQ^h*mU#RK^2U6=G z`UX1HJFd=G-V|H*42@yS{=#Vrl*B=VNQrtm=T{#I=QR*o!fO$RlZ4cx=%n+d;oKlt(q}Bhra*-002ov JPDHLkV1oZOieCT# diff --git a/Pictures/Legacy/DiamondTier1.png b/Pictures/Legacy/DiamondTier1.png index 83f0cbce7142e3fc605a16543393344a36adaf7f..8748156fdbfecb5c0997815f4546c3c9150044c4 100644 GIT binary patch delta 358 zcmV-s0h#`z1EvFzNq@os01mmhbq(Mi z+@yZ^_%;E#%}g^ErnE{+ILX8*)XeQ=%A-29@6IfU6>xdoX;_xyc0Ux*?hX~DS=c;p z&T$CXP;SXx9QZYyfD*+SS?kMz7@DT(IOxz{xE|0PkcIl(&VL~RF2^t6V=ikKF`=mIx$r5K=HJkwX#gZFY>&t->BK#VIZ^M${PG|+tcma(002ag3wri*8{{R3007*qoM6N<$ Ef)HEl8bCa_T5t2TBJzFxvx2Kf-l!daYf?N8AHOfM|a%#619j3+M#R z*T5D4HiuTn_N0g(M5XzE0oV&+aH%qeR>Vwi;26rLz%?C>wG`Z7!%B7fyIsydKu}FYzE*IgN1`F=%xO6Of z9oN7MfVpf1t@YzT3lU+B$$!I^z?0AlaO(|F>I34AZ~lMlRDl2h002ovPDHLkV1oV2 BoY?>X diff --git a/Pictures/Legacy/DiamondTier2.png b/Pictures/Legacy/DiamondTier2.png index b2b9e58c989c4dbe133c63039156a330954ff41c..484f028f6f5d084aefe38083da1976a36643c308 100644 GIT binary patch delta 392 zcmV;30eAko1IGi9Nq@os01m={}9KjYXD&GvXWg$X$u`25{d=*wol zEDanNtA>W7F#GvR6^DTtjn9lN4zxxx;33ZBTA~6|a5r!_Fn_s$bP@5<_z0o6n&0C* z8VcIBE#}5tuj7mhskn$32y&y80K%3ysO4*z2Dl2k8gSi50CO;x8>LN(EdUV4({oR0 zagX<*>vqLj)h+l>@DO>Ubi(}2Ac2PDH2-z#=bVrb7)rFXAXL3Lc97BT9x43^Xpn{3&%ONIeOi} zrvM9W9v{+zd5p!;y5=Aj=q;$VNGjvg%Ufq`<#fzjAPji6i|>FJ$-vMr-7Vx=q5>W! mv_|pY(35l%Qak}6`~l_a-hbIW=o0_{002ovPDHLkU;%>ZezLa! delta 378 zcmV-=0fqj@1G)o{Nq@rt01m?e$8V@)0003`Nklxm>Xd2w*o1#AhZxnl`76(!z7_bm$Vy&bDbFdg#49spITz^D-G>(0KGasF!D5Y&% zitcn>M^PPINZCciK#+$9gf($cS}&m+pf1R6!1Xf%*n_=1YGkhfK-hPHX68{bN$qw; zt>PPfD0!`2+ zJp$h^KjoR+$5D41%ETHCG>IdjCTa~(#gPyb-Vjp8$Hfe0>zlAMsHdRoa!vt^M76zR qYE>S=5GHI59l{vs|AcBC0U+qluV zHW53>AW&(UX$vv&B@-E<{_pfdlSp=F_fYGf00000mVbaM!4ja9)`lX%t^g$d zUE3@*cQkQHcv*s5mg*00000NkvXXu0mjf9u9zT delta 301 zcmV+|0n+}11A_yQUw=Ug!Y~j;8!sTb@is2JiLUhq3I#oaYrTmJZ{tRBEm-|AEop1b zOqxl2Ae}(rKPS_Ms@3yRWC_s%`}@@_2T1@s03n! zm)Kdg4x}KtKsAKaEyxS^Q=2Pgs%|ihts!(l2?x~sfY=sLC4YDwAhgzoBEg=4E>7Ed zc3vOMs?IlYuNmk9;b6L3=qrcb0%dp!SE83dGaSq|M^n-876=gzyaYmp1GYfOaKI7> z9S+C>oN)WOcfGtw0zUs7!IU?rQ$V8aHa`WV!vSjuLx%&hfJC?kr{Vi#!nqmshfHL% zwm^da5wO2lq$aVmY8{9n(aiXdk5jWwK$g7#sR5fK$36=+00000NkvXXu0mjf4UC3I diff --git a/Pictures/Legacy/DiamondTier5.png b/Pictures/Legacy/DiamondTier5.png index ddc2801e37c69f23cc6f222d1efcd68c541a0b2b..08c41ca1c9255d0f9b9adb04906b630d308ea69b 100644 GIT binary patch delta 331 zcmV-R0kr;<1DFGlR(~x?L_t(oN6nW@4uUWgMXMXoIB*fHP1m6A!L_*v2Sy-^w z7sU467k?)q0s`l>=>SH{%lVpq$Rl8TI^@IevY5=C11{6~DDQrR@p0eII0D9b|G}r_ zpzmk{RQV>QD{uL<3wCv8z{`+OjWFZ@6Rmf<&c^>KNC7PG6Mv0x2bAPSB*GQoksE46 zH9(OYN<=Y$AFytkyjO>>twmI40Hd)Hc_Qo@zORIP5pu*(2%q!|6*-Us z433D5nh6B}7DnYD9PlpwKY$mTis#;9!0P_WhTlkp-DA&qMRf)u5nefPtpO!MkpuT4 z^hBs~;0^$#h(w4SNC99dA}R-R02mTQ{2D0cP5CLwS7Mn_@=VfYa>~F8|A6y?qa8HoGwT4dwM5MqR)vj9Y#!2V+Mc zpvtSJ85|1i8mxeoDWMt>kprTrs_Vhg-g87q0W2TmjW7qK=JPlU?Yv5cS7a6JP> Z@dOd!tu>F72NeJS002ovPDHLkV1h%ziVy$* diff --git a/Pictures/Legacy/Multiplier.png b/Pictures/Legacy/Multiplier.png index 9b3562297d332a559c152d0e99c214c0c56ffbf8..3eb13fb299b7da5edb08d79b44cd0f85e58b3ef2 100644 GIT binary patch delta 351 zcmV-l0igb%1FQp(R)0ZBL_t(oN6nY94uUWchKs9lc5!gfC-4z`Cs*U@>o}XZI`{-S zI5_BRoT~@dQ0j5LLkoNfNogqmM|+fz*`2kfLkfWtp0&+_5?GrITWQ#sa>hRb18f$g z4hMpaQlO1+hnH2Ifez@mz~lC^$HP58ppD&8G~-x->*Zm+MG{?tn8YvPfT#vIiC@Bj@>?L- z38|;`QH8@d;pqZ|ML delta 339 zcmV-Z0j&P41E2$tR(~}~L_t(oN6nY94uUWchKsZAE+!881U`cA;7dqKLis;>mo{YiKF>{$`~=R$UDvDv0@*ezMrp{m&VqjhM#a#Q zI-Kw`N`WrI88@r40(~%Sf#>~gPRED6Xe>oD4+`9_FLT))?0-dLi3C04&qIhyAdzsx zr9grCVq%t?b#aF!Lg6%*-hqGu)7e-gfx_t>h-e975^cf>Q4b)AHsM5h7D#r&(ATO zMgj`N!kIP_P)tA)&L9bdxCv1>6OxDlcS0@!5es*b%;TL9B>aql{G9fNF(0VlHyY%u-BADl002ovPDHLkV1fsil!*WU diff --git a/Pictures/Legacy/MythosTier1.png b/Pictures/Legacy/MythosTier1.png index 632ca62772bd679c3c18f9d8bdcb34013bacd0e1..942a791f674b48c003f6d7d69076148f80b3e5b5 100644 GIT binary patch delta 314 zcmV-A0mc6R0*3>TR(~8xL_t(oN9~t83c^4TKoe_EU=AT@s|U~vSm*(Aq%>B>!aCpu zv{mpBdII~%EHhyfKRYwoBnm!Qm@I+!Shh&Q%`DA>4lx18>j59zWfD!F1CmP;;@AlB zFfL9U0(v+bnwA4qM-d>Er}J%YFWhEfyGkd(g@oh9$SiwLihnr3mJ@X%L;TVjd;`;Vn*Y**<7+K8w+zT@WQCpn>s zUt{ zc)f+VKk~rX1Wdp8IbPTk^d{APgo8q3iz1p7da z@&HRY&KTMp)IEv-F3btlt5Sh6m;=lK<^XJf$d4*VLbndE#($l!ih~UhCZQbh=zhn# zYJ@pShp_^EFqv@}d!XyZOz5s<44|t-ech&F+H>$a{=OpdQQ}nagtxH*F0cxaUYg=S znMt;^1|YNbsuZY)fGIt4kZlO73cz%?Ekz+z`aUuL(F0we9Ue;|WFNd}-7DNR+-gkY>%Wl2@4QQTCsb58?x3!%(0#^E6 zAuR_(hYiRfH@Gfu0;#meD|w+=1J1V-d5SCnp_^BmsyC1RDSt>(fDsRGJ|%TY3J8sy zA_uHH5R!MVZgej=1ITi~6`DE3^SPX;Zj5kQU=`LH+r0x-Fn{+NFOOpIwaeKreDB{<`Qi= za2-{^9CAzD)!2bhzQ;)uAJKr*^+*#RkpSPy<4s&$eFOzqv46YrA!(hU0N<96kpt0p zz$edNIZb}V0*a#jMIVv_kpL^to>_SZ961OMa9559t{emf__o~`Llck50TOaBDL_gN zMh8gB!KeUfIba89$N?)rOAZDDH07W-KwAzv1Llwe_DiTC2dn@sIp_?4)Lxpfk3fqm up#I0AP2JVlfgw2}T*rU>oYM0GM9~L9JZA^D2rrR)2^|L_t(oN9~s}Qo}G1MQw&Nq~Q+GFi<2p0QX=fIRlMdafTFh zaFZkj3=M~%$t8@x(P~yJSz4LcZg?|0mJ`|g^|i9C^7Y}ZDQ2V-aQNPv(`i{~(FRH3)4|+`h;Jql26S-9% zBz0Y9edU1mny3SVYv9~CJEN)g2DCf!9N^ogv5+~uy&&O~z=2MHIiG=|_yOS8aPHIs R%|ieH002ovPDHLkV1kPt#7_VK delta 419 zcmV;U0bKs`1MdTnR)2&^L_t(oN9~tQZo)7Sg_DXiu<0FGRdhjnfZhX%J9HCe(>oxs zgPTwmt-9(R*l>xE7iOZ#*ons}NjCkY5jL?r&(Guhr2Dr+kxWP>;PZT>?zp@>zPbXo zzgubz!)CFe)=j_zwJU~B4s?!Mz!=FHnXBQz6#NS?3n+@h9Dgy?$FQpiG3n|3M7=Pp zk5!VUDfRr|I6BABM{II{@m42HTQGl`d*dE-3XrS++I>6GCBo{0xd@-v%SHee@fSyC z^y}c;`^(RTS~o!eA{hRUVHdgz((HgMGs9fAqIT6sdYwP7$V7Vomi%_nRg~;ej z@L{Cy2YS_#nAMvfMjE!+7kvl{;97{mviCLEg3=B=HCiLfvT`TvV7zZ08OVv;rWcZO zLTcH`^PF0Kde^|cX?z)t^=*LF1IGcrFeEyM^KCdLa2%i#K>Z0wk}HS$Z~Q~6tEvD1 N002ovPDHLkV1n+e$aMe! diff --git a/Pictures/Legacy/MythosTier5.png b/Pictures/Legacy/MythosTier5.png index 658ebcbb0731fc9201602bf3d68bb7221af10856..1884b733f5c9e4c4e5336d238c3b760695c2f990 100644 GIT binary patch delta 341 zcmV-b0jmD01EK?vR)051L_t(oN6nYZ4Z<)G1s%kd3MhgGpa5ur6p)g*6Am;$1JD3P zPyq!5J&DE84S2ln?r~bS>s>eC^gI>rR)uO)`4vaN z!rfc6r-DTRd=QfGAj`YRmV@jwfNN)9 zCoiw1eFPFY5Czb3cV-QOnIl3f2U%yp-F}HIyID12ImkW(o)P3A>kN2Cl7sw!5#=B+ zU}QOv2PnvaEKWd44$=XNaxfgAEC>Ao6Uc%55Gu%lEI>&P`U4=PpCa-tP{IfBFBWaM ntF;1CM1+q2_&9aXGhoaI{=&ewYCFsK00000NkvXXu0mjfUfhwR delta 349 zcmV-j0iyn*1F8d%R)0T9L_t(oN6nYbQNutCMjeJT4bTG>Kmqg+&Z#M9xKKd~2o=x+ z4bXte3zDOV^;(;;9Nx@MNmiR)JL-A;2lGNCFF{A4O4wC^gL_t(oN5xmUP6IIzT~kt0ASe(=6hRG$v}wal%`fl;(4^rH z_yt<-qfHwLs6kNxi2{j&l6Ki=c~-Nw$Lj==JZZF^@$Sr<=k;2v7A`l_WQ5QJe%fEg z9WKUelP-bJXNd#|jDP7!hJK2pC>6E|g}`g& z1Z+T=`HKxPDet(K?rnGp%$={NuRAyDZTD7z1bj0U?9?}hSWq2wI(4{~W=LQtMq_TX zXN~NV>ia2X8=u42_Gt`5O~k|{u<^ckr??U!pkw}i02up}a0rm>#w`FO%uoasH*P7S z6^MmYTq5Qr0Dl#}XR0a8ga(Gb6hJpVGt&+*Cn+NmnE2=@nDjm%VfU$%XcLl?iqbq# zssNUQx}&R3*j&=%diyk~Hy(R>@i?NE0Lcpyo8kqS7$-|A!j}+50LknQb?2G2YWvza zeD_NzC4jFLCCigGpWWmv<|r0GkN}F~OfYT^ByZiXsDHfktT+|qWbr)4A&3N|;sg|| zELRh4LbrH6bfRjY5I>Ayc!>MlLUYJv$6&q#uIIyu@Nn>=_qTDQfUPVoheIGFy_DoH zh*p4zt)49EucQe(kk%Z}`WkQu*f-(@3#nowbe#L(RRG1PFt!sfu9WgF1>Xrof)l~m z+XRx?yG5YPkSrz!BO-RZ?_B`cDoEb}09}Wc?_YjQ&{3#}4gOrL_t(oN6nYHN(4a=hGz^-1u+o3*<2Pk)X)n&QeVL*FcA}< zz*jK!0IyKPmBoDV1_KdHO~?M*uA!%h9^TzpAIV*?97FHHrF&74X&k zaLwK_*ci?Wc;CNuUUwMTnR8x1K$YNTp7VZqT03)IF(d*427jz)=p;CTQeZAf!;h5; z;7pvXMB~THu9e5nxJve%pn$QXrRaJ6JbKx1{1RSxQ%+EK+bu zSWp0}@Hskdt$*8eQ~_iYG6{@Hl@SFDy**fyz6UJ$cz172TAZpVjf27pU^^%~dSbz3 zw`To?=3z9y*iwUNl-dF;?w6Q?`%s@Rma3>xN&pt)86tDobz{q#Pw0J#LIJoFXfb-m zdu{vl@%wniG*kfyjyr*a#c!_aY32w{0e!KUUxX+?3V%)@;MDAlH7Q%n*KSmcnVh+d zU?zB`?VC1+wL<-&3$F5IM6|Zsm46{|l%?&+3D8O}E%F;mSAc}o4{GY!mi8QTLkZ*r z@E7rcX;tB9*LjFw1rUq^<2d=j<2Vjxg7*m$;R}HuOafmbKLtf*1eEHd{?J&*rvUIO z_}O!iwJ)}PfAYs9NfI>($7FAx|L?C^uSo^Cb{~kMZ|O6G(UEKSZU6uP07*qoM6N<$ Ef@**d%>V!Z diff --git a/Pictures/Legacy/ParticlesTier2.png b/Pictures/Legacy/ParticlesTier2.png index e8ef46642ecc1081d79380e73da23ac5a9c956e7..cc2f0664c5011e2a74b87d62a167158cc3f31e51 100644 GIT binary patch delta 295 zcmV+?0oeZX0`vlqR(}aeL_t(oN9~tA4#F@DMiWLPRs<^xoPb_}6Tv_i4#Y8f18#uC zio_al6-Q2JsheMfc#@@NXunt6Ln~M3oe~9U1s=^!AM-M;=I;X6QzP|d5|)R`bQ}aG z`nn}`IN)X&fgIro%`zjf1nNzi#jGzT14aQO5FoJFZ`BK7>VLSl&oRn*CS*dkwF4#i z3k(a~rRuE+gms`xVx$~jV5X#1NMI-YJ3u86D#PqV+$E$^Zl`+i7YJ-U!WY1nx~*lr zT=M#Rj*58xBLhy}6mAD#g};0K72 zfwk1F9XX+;ZsH~gagrscQt{PxC0Z;`+tOsD7I>cTcudQ5Gk+Jj9WR)T!(z9_tPz-C zUNd%az^`EiQWPh6Ejt2!vD~jP)1^3EF>6KvBQPLP9pFu{QGW?IXN~ZG6KXfnQgtd|%A)rSg00000NkvXXu0mjfK8AMg diff --git a/Pictures/Legacy/ParticlesTier3.png b/Pictures/Legacy/ParticlesTier3.png index 43d552c55cf10cf73bf33b784caf28598ea591f3..694580cbd572e05742a5fddfa58b36d0760b1690 100644 GIT binary patch delta 534 zcmV+x0_pw81mOgbR)6+ML_t(oN6nY9P69y?hVRshL>m(mTPs^bL2C;!JOD!H1K3m3 z`v7*Ly%x~gQV?6;z{JEx6FRfjg}CFKg*8!^J^oAr z!q3wtU2NRBCw~*YWpoBz5))C(r=oU1F34#C5f^$NPgHePaS*))z6n%c)_x!+G}9U@ z*MM*0Du2yx%_(O^a4w?V|4cTKvStx)A2#FiR7n1s(U!>Qtq4RPc93$C)Grf z0jVBQW&+|g;QEssUGAYdwgWz`Sd?4EtIxFN%KE?mt`XVmQu2 z!Wcv5I1Rw-dGK296RX?@=G=&hyF?9ag2K+I&b@()?2dw4;BK4h!q@m8n^VrWK$iUg Y9r$?nu->IprlPC!~r05T!1zQ zNXrH22=ve-EhPv<%MlO~1xU~#!&~o|@pxyw4spyUjk4>%_hvkHysfpXy~H$#HSl@+ z;-=GOerKg<;JJV2M)k1T+jgVWz>FJPCMDkKzPnKosgW6|Gk^2m=|>iTYvn4?1QR!a z@(%}#ZkA>rqSOE`C?ggw-alEeAqg6Q7_yNOV?v5+s0K*fhi1ZePDmV#-2bzI|KV`UayUD zV#erwqoGy+7k@$)J~DB~!H)^bxGKS0AWa~9U-Zv$5k3*C9NPI4Bq(QFSit6UY84-L4VrfwbhmP*sR3 z-L9b;;Nn{8LC6HQbHhHe&vN=ulv(qCw$R0}pOYksHK&2k^TKDjB$T-X=6Hm}IY9%{ yAh$BAb8Wz()luOV@MTk7NR9uoICb*|Fyg>lwG#F`Xl96OI*dA}kZ04S+CASPbCLD}|_zHgMp& zoCglx0}G`cV}OQ8t+mY@ad7-?o|i6vC|95H6VQaVtp#4n9AqmT=YTB0D*@4N^=XOH zLjmDB3E2dKmw)6|Dq_Fl-Ni5CoB9GNKYN1MaRmWEOcb5py+EeeGKQAA5pr zFK|Py2385K@sWY}`pUfK6nvi&g;{a@7ak>7gXaR9%MFA!GAUfL@LX?^iI=x8am9+K z7N|fFM>c|X{I#M__nC)_b2`EV49IO5sRb$!=8^MU0Dsj?!3?llI-}z-d>H`fX>KV? zBS-9?CbeR{p(Dg2p73RWCmec?vL7wyZIjX~zANBHHM3_F>ov-G4h$nO0}yr+#{?Wk zAO;}H0aS5y1;~tTKrOSA_Wi)CP{K8*HwhG9fO<|#G*uD)X2`WGa#Q7A^v|nOt V$&5gT`H=ts002ovPDHLkV1l9M{tN&B delta 552 zcmV+@0@wYL1@i=uR(}XdL_t(oN5z#rO9Md=hELOoigv+56e4P26#}Nv&VUH{1A?`M z5b&!?VPTQVugYKGAFvW37NQo4A(e#@1Ut1;)Gp|~lbdC4ckj4t?&1T(PI4jddo#1U zJ(<(uuk(+PfuGxV?_+oA&!=?*ua!G5ONNp1te3S6^m;j=iht)O>s}Tgs)jINdh^;- zHgOZa3NTA6pCXbn!Dt4`hu_ZG$&iSoO&BX+A}JG*4S*y}_zd9BD;opU1`Z(Sv4eBK z-J3WKDO?jGN4PT}a@Pc{>ThfUn$Xr-5T(pH#em;vX<4e@LdW^C!kCn8c zjEZ#yg4kP_cebiWl=BRP5t{)Bo5V4IVZ>qpq8vaKS9gF+#|G3go5U|uSCpIR$N-B# zlmp1(eWf?bgRnY?0Pln#`HL1qrDvFUorn=Sj86<{%YP4Y&lLV{Ky#A?s0qR0AepGuSB9Ie_a! zBIXo;&Use@=F#|22VOHlA|M458>K8K$r{6*Yi=h8r=pGH&7ZX z&Jk5aOe%r|z-Dtx>sm^N3dIx*+QE@fPSxlL++NgqO9w;@^n12c3Oz~yMgc{u}ybK3NoeMT`UqpgC1VP>j*>yvU+c0GLErQ)4?@IDbX~QWaZ{RVu>joCEjSQlbk` zLq?teMbLDh5Q=Hciu5i}%yzbe;o0w617@4YcY#v?n9qUBT=$w^Mh4Wd3mnyr>uKKG zGezV2?tGHvpn$?vi_PH|k(Pp|>wVD%18D!Z%$fr2%XarZ=&8SpwFc5OP13yw<{Yn9 zJg1!tAw7Wpu>dSoYvU{$c(vj=?bII@>Pw1%Dgy924}hjs_3=M`PI2Y8(Vu{ z!A5L+1$&=B!NNkZv5CHbie-=>1R;fj!ks&tnPhfuckhmn#1Dp@-M!oScV=^UDXd(z z<6w?x0biXD?9P^QtDY3lJ9|WLIy8>A&>IQ}(br5G{Ih$Bo_`w|V@VX#=umLOxY< zXW;$m4!tBGqEz%RNe7+CC4jO(A_o0eZJh7lNM|AK5PuVy1n`_c2 zS7~I*B~}4^$Fu`^vbhLXa02dgl_Vhm0;$tM{=0&3ki-Kq@OKgraWt&u8a zfE=6HoK+=QZ0@6nT=d|Eso^^V1r>bgQR^V>Y3E}k0BRzLgTuzqqt-#%(@y?j;jxSi qSVW`-&jK&2jPXDIoML|t1i>GLWa)RlaSj6j0000@!|V zfjl4;DSbzmsz()dBr@GTc kurp4eW<=s@{Cf^?04x86XDJPIF8}}l07*qoM6N<$f*7(+C;$Ke delta 177 zcmV;i08ame0{;P!R)3U9L_t(oN9~s}4uBvG0Kvi0pE~;xf9j@7r43*Q2Gg1%NiQKm zmb+9IBAgq9o?rkRffjyRtl~rWln#ivwR|UXS1byrX+vsSETA6DFq9 zQedd@B~*6r4XsV;{Qcl*Nf6+#6qfh6*e~|I-K*F^wDm6T>=CXI&{NJtXF7p}`11gN zN&hgp7uW{4U3#|UUSJo%6DyN5b^$yw|0*HjO}IG?9#0m}vwuF}dhb4B<@o7w6fdGu zAd%}EO&)1`3-~mKLKNBs6v#oFfI>N_52%oXx`0YKC=ZyDXGWC;G?<*3AJ9+^<^?pC zgZuykIminzl7s00Lpc}^FqQ*7po1Lf0T3I@LEb}X$d3fvT)5voiOzHaJtKr`;m>oT Z7d3CY@}|H(=?nk>002ovPDHLkV1haidaeKf delta 271 zcmV+q0r39d0^9wR|+B3NJjvm0BE<`@UG*lhS z&kPt}LY%sJ585=Tb+@B4BSC<>ny_%$W04Q;$^Q|syEt?pb%lVQa)O-m35?>u1Ki^h zr{$cY8epe=oR)KnS^({s+c}{YKs%;iE+o7O?e-Ke%W?N}oPXZ2n?n$D$M4&>YYr2TcL3a!?(xCeMwk3Xs@2Q5+yC2SowWa*!RM zAqQCjT5_-&peYAm1GMFU4d@{UYyiaCa**{9YVsQa{yVKZD%PDHLkV1gj?cm4nX diff --git a/Pictures/Legacy/TesseractTier3.png b/Pictures/Legacy/TesseractTier3.png index 6191b16ea2beef3aaa85befb154a1ff32ee337a8..4f89d836c5d7da4f80040b89e6e48faf8273fb01 100644 GIT binary patch delta 261 zcmV+g0s8*b0@DJJR)6S8L_t(oN9~s}4#F@DMI9vAI1vL!U}R@uVTU7d02UT@MvlP1 zgE%4gjJ-$68HCr0$AjS{e27(QQQ^L`{a0P_7oKFopwPRB4g z5C=d$n}?5aQ9vv?=pSG|(Xr&9UjXLAa1~7sx(6u8LAL-UIrtx-Cw_%00000 LNkvXXu0mjfJs59^ delta 262 zcmV+h0r~#Z0@MPKR)6V9L_t(oN9~s(4gxU{McWmN<3I?`fW%^OXwHB@;V@VvXFzZu z6p)aze==Q`1eR?(ZB1WN(!sp9OF}Z*+}B3s1Oeu%=wM87tPk$0`GU}6z9gXQqJWfg zi*>edAQvT|1pEvzj~(CQQhtIGAQmv4@Wm04faOA|^MwaTf`0=b-yeAJASmE;43h)z z0LW)^9s=+RkdgzZfU2tLFIq|toC2P=t^gTf1rjM`NON#Tc8RdcknmsK!*4e&+lo4H5=Ji~u7XXKe-08XvDgXcg M07*qoM6N<$f^!{pg#Z8m diff --git a/Pictures/Legacy/TesseractTier4.png b/Pictures/Legacy/TesseractTier4.png index 90e370e787b10ce7c9cc21aab9b76d5c96f92d6b..d1ebbf881852207da82590fe41d9ca7749ae3139 100644 GIT binary patch delta 404 zcmV;F0c-x~1K#8G=D_StHyMpp0oM@kj-xC zpxPk}a!?mQl(QPE@10`gxEa!vdXarYctpaVCSdL{s&7`$U!+k+;-`N z)?R#8DF^<4!EC92S(|z8(JUP@%4xmebb#D}OFdq#VxbA3kDzqgA=0V?=`&!t)p|e= y;LhC`a^M4eIDMu=5}f-Ej2R+wP5k$qXbb-aKlm;n>kXv<00003YR^~`ruya8-zSJ zgAR;c6riWvVx6u7OVK5O`gs@XurXIY{~iGH9J2zb&#OtraDQ^O74qnE7zb1bAldqE zQeg;=98?8xa*bTyyCO^oDyAH;16a8yHH<@0eOesx63-l9#s2@}~ebuUm@Q0b0nxtN^X# zfE_^XpN8Lta(_?^AkW@}*gw;_Ms5R_V0FNS_4`QlD3@*n$9bFu{0ST0YcaGx@J& z!JU2v8olQwq5C?nK(|<@geBrs02a=t##K=S?FbYVmqMulM{+<5 zu*d-=z$yon0EjJe&=gQwxJCF+HQ>s^R%jogl@Txk?h&y5r@5ofeFr=va#!cy^AHwk WuXmfzy{wA>0000W0;K|wR)4xlL_t(oN9~tQ3VF95^Dkc>4cO3 z-T<6-jF1p$fh*z^MF<;kMf*en2(%zG#sGY=_jI#OzTx R6SDvS002ovPDHLkV1gqyUcmqW delta 212 zcmV;_04x8c0-^$tR)4oiL_t(oN9~te3V>@MtngHVji$E+hECez@3+t26<`UK84iLlq0((6wkb=Ae zhyndYHk=h`x^Hq(XP}$_rlB&OQ>iT|CxGd0o6f1!7LWt@Tun2dZ_8={{^{7{133Vm zc8aLv-vV8UedNL#Kv&u~vXOraLURYeFP6|?uSW%9git;5c$~sM0gN3nB!=u|AWE?S O0000K0>uK5Nq@os01mLF+!onU1Uh)9iPR8J~%O@#U<4RAGACZQ>B{@XssS zav*kW0WIW6=-N%72Y0|927H&#EVT&E4;Ypkj!S^v5ioBZqJ0w($}^MDxdVvc7>)%{ z<1Lf}jZ>T22Nq@rt01m?e$8V@)0002jNklqcPGd6FK z7>5N)T{+-Jw&OH7sZdXfl)Uchw2uzsD~zEdbHL+?r^cL5Ou*%e8z=5J+)O~g0rxZB zav*hl0$Ru;)U}vE5B7ln3z$A@c1ip^U^sr41-C2Eo|@tkKzil5Nw~ZN5z95K3XsNI zDhG-Kq9l#bge30MfX;$-ac%>;c;epnojhP}gDtEh19KHhxa=+<_3@g_}<7UmI8(00000NkvXX Hu0mjfxEgOn diff --git a/Pictures/Legacy/Tier3.png b/Pictures/Legacy/Tier3.png index 11145d4518480aef0a905593384e529167bf2880..7288732bf29912c329043f49991ccc0f7925e19c 100644 GIT binary patch delta 217 zcmV;~04D#$0>lE4bAQtLKO>Y$6L5SlBRs@G4q$?^!GPA5g8;f6a0k%Cau`6i3nc^w z0t_(+diXB0Rdkl1N;tvxt@S8C;_wy0V0AP1_pTu&{6^5b^t6PQ3K-v@J1;q zO)}+8z8Hqy_1jERG=UnY7>&|_0HY2VJPttavCtYI+cn@_v%%3hh4KdgFfafBfiK9h TWx5OU00000NkvXXu0mjfBWh9A delta 217 zcmV;~04D#$0>lE4bAQSO%AgTAwg<`p0+0ikplmRpwdEjyZU@`}^spQTknKVVfq?)+ z%K^XyOAwO^NDl#CV6lM3d0}}MNRj;P9f`_yX!!Y(;gtL!5@BPbR4Tm z`d}bJoOzD3ahP9jb_cQuOwX{|neiqFjQ4p6pIw+9!`g8#a0%ZFy^DL|8mqt_#R1pa zbl?ce1>WDgvqT}ffHC1p;l8{85?sG`RudjYLhk?)c}hCL|9|k_1b;Myov;h|7E4iy zU4Vy-gGCHNx&RVu$sq!GPX=9pPYJZd(w+qMSAY}7VZ<%~_>>4>5UCfCfCS4Zv=ykJ zT)=X_O|KvxF04}l;&pR07*qoM6N<$f;CWny8r+H delta 294 zcmV+>0onfV0`mfpR(}XdL_t(oN7a{Y4#FS|hM5QOI41hrWBXeZkK+Z9F1)5AKq=#6 zK1maZqkZUDB8&YPYbLS^yxx8`nCm4XaJ&0KC!P;KaFD>sk5_sZC&C&(ff2<4ueIsG z42lKZSy4qPqJTCbC|#EoK!W957lb4sb^wWpk{$79_}UczbAJeXp%$PP$D$Us06%0r zxQIqb6hLArIYaaX(u3SD7v+LxXBk?c%SX7snCc sHk diff --git a/Pictures/Legacy/Tier5.png b/Pictures/Legacy/Tier5.png index 8e17d2b5074a23e66c15b93dc5f009fa1b0ee94b..cb6bfa17b58bd06c1356a462a0bbed4a4d7d2f08 100644 GIT binary patch delta 301 zcmV+|0n+~V0{Q}wR(}skL_t(oN8Oh(4#OY}MM?KAJwvA+pi<_ZyK|%-pi|G#p*;Wv zhTvO@=m@UpB)`8RW1yxv6>I7nMjPJn_w81_+aV*6;-~#bV zP%g0ay(?y+On?(mD8UzqY#f|(Oo2pRz;0IfRu1NKX@S~cN@kz(Aw&entdg_xsR(}ggL_t(oN8Oh(4#F@DMN)Q+TyN112WZAm zphdU`X9W}J!T$(Mn>i>ciwJOmQi*B-A2e*k0wfYu0yvz)-GAdy--M|ts0rZUISCa3 zANW4(Z2>U}wF&rO0QZz)0qKZSs7+w^e7P>{DMbR@8{>Qa2tu$Aj~z?32|ysO7})}I z-@9ZlWC=(DawWt9+`{;rV{#;t0o-M%4tC vU_Ao(k3}1t6(UTag#^u5$Iq#|?tn30k?L^lPq6v#00000NkvXXu0mjfc@}-J diff --git a/Synergism.css b/Synergism.css index b95c5ae00..d840e8865 100644 --- a/Synergism.css +++ b/Synergism.css @@ -195,10 +195,11 @@ input[type="checkbox"] { button { min-height: 30px; color: white; - transition: background-color var(--transition-extra), border-color var(--transition-extra); cursor: pointer; background-color: var(--button-color); outline: none; + transition-property: border-color, background-color; + transition-duration: var(--transition-extra); } body button:hover, @@ -312,9 +313,10 @@ body button:active { font-size: 0; z-index: 1; color: white; - transition: background-color var(--transition-extra), border-color var(--transition-extra); cursor: pointer; background-color: var(--button-color); + transition-property: border-color, background-color; + transition-duration: var(--transition-extra); } #notifx:hover { @@ -679,10 +681,10 @@ button.isEvent:hover { } .subTabWrapper { - display: grid; - grid-template-columns: repeat(auto-fit, 145px); + display: flex; + flex-wrap: wrap; justify-content: center; - gap: 10px 15px; + gap: 15px 10px; width: 90%; margin: 15px auto 0; } @@ -692,7 +694,7 @@ button.isEvent:hover { text-align: center; } -.buildingMainContainer { +#coinBuildings { display: flex; position: relative; padding: 0; @@ -702,19 +704,11 @@ button.isEvent:hover { margin: 0 auto; } -#buildingtext p { - margin: 0; -} - p#buildinghotkeys, p#buildinghotkeys2 { - margin-top: 15px; color: lightgray; text-align: center; -} - -p#buildinghotkeys2 { - margin-top: 0; + margin: 0; } #buildingtext { @@ -754,6 +748,7 @@ p#buildinghotkeys2 { font-size: 0; min-height: 182px; text-align: center; + display: block; } #upgradesFlex > div > table img { @@ -864,7 +859,8 @@ p#themesTitle { min-height: 20px; margin: 2px auto; box-sizing: border-box; - transition: background-color var(--transition-extra), border-color var(--transition-extra); + transition-property: border-color, background-color; + transition-duration: var(--transition-extra); } #importFileButton:hover { @@ -1006,15 +1002,28 @@ p#promocodeinfo { margin-top: 0.25em; } -.buttonRow > div > .image { +.buttonRow > div > img { height: 32px; width: 32px; } +body.legacyIcons .buttonRow > div > img { background-color: black; } + .buttonRow > div > .desc { width: 22em; } +.goldBuild { color: gold; } +.yellowBuild { color: yellow; } +.pinkBuild { color: pink; } +.cyanBuild { color: cyan; } +.plumBuild { color: plum; } +.limegreenBuild { color: limegreen; } +.orangeBuild { color: orange; } + +#multiplier > .desc { color: yellow; } +#accelerator > .stats { color: cyan; } + .buildingPurchaseBtn { width: 15em; border-radius: 8px; @@ -1027,20 +1036,25 @@ p#promocodeinfo { background-color: var(--buttonbuy-color); } -.buildingPurchaseBtn.buildingPurchaseBtnAvailable { +.buildingPurchaseAvailable > .buildingPurchaseBtn { cursor: pointer; background-color: var(--buildings-canbuy-color); } -.buildingPurchaseBtn.buildingPurchaseBtnAvailable:hover { +.buildingPurchaseAvailable > .buildingPurchaseBtn:hover { background-color: var(--buildings-hover-color); } .buttonRow > div > .auto { width: 6em; min-width: 80px; + border: 2px solid; + background-color: var(--button-color); } +.buttonRow .auto[data-status="on"] { border-color: green; } +.buttonRow .auto[data-status="off"] { border-color: red; } + .autobuyerToggleButton { background-color: var(--button-color); } @@ -1050,16 +1064,16 @@ p#promocodeinfo { line-height: 1em; } -#buildtext12, -#buildtext14, -#buildtext16 { +#accelerator > .stats, +#multiplier > .stats, +#acceleratorboost > .stats { min-height: 2em; } #taxinfo { text-align: center; font-size: 1em; - margin-top: 30px; + margin: 30px 0 15px; } .tightText { @@ -1171,11 +1185,10 @@ p#promocodeinfo { gap: 5px; } -#buyamountcoin, -#buyamountcrystal, -#buyamountmythos, -#buyamountparticle, -#buyAmountTesseract { +.buyAmount { + display: flex; + margin: 4px 0; + column-gap: 4px; position: absolute; left: 80%; } @@ -1183,7 +1196,8 @@ p#promocodeinfo { .buyAmountBtn { background-color: var(--button-color); cursor: pointer; - transition: background-color var(--transition-extra), border-color var(--transition-extra); + transition-property: border-color, background-color; + transition-duration: var(--transition-extra); } .buyAmountBtn:hover { @@ -1193,7 +1207,6 @@ p#promocodeinfo { #prestige { position: relative; padding: 0; - color: cyan; flex-direction: column; align-items: center; max-width: 1600px; @@ -1329,7 +1342,8 @@ p#prestigehotkeys { .runeTypeElement { margin: 0; text-align: center; - transition: background-color var(--transition-extra), border-color var(--transition-extra); + transition-property: border-color, background-color; + transition-duration: var(--transition-extra); } img.runeTypeElement { @@ -1519,10 +1533,6 @@ img.runeTypeElement:hover { text-align: center; } -#transcension > .buttonRow { - color: plum; -} - #transcendshardbonus { margin-top: 2px; } @@ -1700,7 +1710,8 @@ p#transcendhotkeys { .challenge { background-color: var(--button-color); - transition: background-color var(--transition-extra), border-color var(--transition-extra); + transition-property: border-color, background-color; + transition-duration: var(--transition-extra); } .challenge:hover { @@ -1718,7 +1729,6 @@ p#transcendhotkeys { #reincarnation { position: relative; padding: 0; - color: limegreen; flex-direction: column; align-items: center; max-width: 1600px; @@ -1823,7 +1833,8 @@ p#reincarnatehotkeys { #researchtable .researchAvailable { cursor: pointer; - transition: background-color var(--transition-extra), border-color var(--transition-extra); + transition-property: border-color, background-color; + transition-duration: var(--transition-extra); } #researchtable .researchAvailable:hover { @@ -1836,7 +1847,8 @@ p#reincarnatehotkeys { #researchtable .researchPurchasedAvailable { cursor: pointer; - transition: background-color var(--transition-extra), border-color var(--transition-extra); + transition-property: border-color, background-color; + transition-duration: var(--transition-extra); } #researchtable .researchPurchasedAvailable:hover { @@ -2445,7 +2457,6 @@ button.language-select span.lang-name { #ascension { position: relative; padding: 0; - color: orange; flex-direction: column; align-items: center; max-width: 1600px; @@ -2604,7 +2615,8 @@ p#ascendHotKeys { .constUpgrade { background-color: var(--button-color); - transition: background-color var(--transition-extra), border-color var(--transition-extra); + transition-property: border-color, background-color; + transition-duration: var(--transition-extra); } .constUpgradeAvailable { @@ -2764,6 +2776,8 @@ p#ascendHotKeys { overflow-y: auto; } +body.legacyIcons .historyTableWrap img { background-color: black; } + #historyAscend .historyTableWrap, #historySingularity .historyTableWrap { min-width: 1212px; @@ -3688,7 +3702,8 @@ img#singularityPerksIcon { border: 2px ridge gold; font-weight: bold; background-color: var(--button-color); - transition: background-color var(--transition-extra), border-color var(--transition-extra); + transition-property: border-color, background-color; + transition-duration: var(--transition-extra); } .oldPerk { @@ -3701,7 +3716,8 @@ img#singularityPerksIcon { cursor: pointer; border: 2px solid gold; background-color: var(--button-color); - transition: background-color var(--transition-extra), border-color var(--transition-extra); + transition-property: border-color, background-color; + transition-duration: var(--transition-extra); } .newPerk:hover { diff --git a/SynergismMobile.css b/SynergismMobile.css index ff760471d..d343f23a8 100644 --- a/SynergismMobile.css +++ b/SynergismMobile.css @@ -2,7 +2,29 @@ .mobileShow { display: unset; } .mobileHide { display: none; } - .buttonRow { row-gap: 6px; } + /* .subTabWrapper { width: 100vw; } */ + + #multiplier > .desc { color: unset; } + #accelerator > .stats { color: unset; } + #acceleratorboost:not(.buildingPurchaseAvailable) .crimsonText { color: #49494a; } + + #accelerator > .stats, + #multiplier > .stats { + display: flex; + flex-direction: column; + row-gap: 8px; + } + + .buyAmount { + margin: 16px 0 22px; + position: unset; + /* left: unset; */ + } + + .buttonRow { + row-gap: 6px; + margin: 0 0 20px; + } .buttonRow > div:not(.buildingSpacer) { display: grid; @@ -13,10 +35,14 @@ "coins coins toggle" "cost cost toggle"; align-items: center; - border: 2px solid #ffa800; + border: 2px solid #49494a; + background-color: #121212; + color: #49494a; border-radius: 8px; padding: 8px 12px 12px; gap: 8px 2px; + transition-property: border-color, background-color; + transition-duration: var(--transition-extra); } .buttonRow > div > .desc > span:first-of-type { @@ -32,7 +58,7 @@ .buttonRow > div > .buildingPurchaseBtn { grid-area: cost; text-align: start; - color: gold; + color: inherit; background-color: unset; font-size: min(1em, 20px); width: unset; @@ -44,14 +70,103 @@ .buttonRow > div > .auto { grid-area: toggle; - border: none !important; height: 90%; border-radius: 8px; + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-evenly; + } + + .buttonRow > div > .auto::after { + content: ''; + width: 25px; + height: 25px; + display: block; + border: 2px solid white; + border-radius: 4px; + } + + .buttonRow > div > .auto[data-status="on"]::after { + background-color: white; + box-shadow: inset 0 0 0 2px #002400; + } + + .buttonRow > div > .auto[data-status="on"] { background-color: #002400; } + .buttonRow > div > .auto[data-status="off"] { background-color: #330000; } + + .buttonRow > div > img { + grid-area: img; + filter: brightness(0.33) grayscale(1); + } + + body.legacyIcons .buttonRow > div > img { + padding: 3px; + object-fit: none; + box-sizing: border-box; + background-color: unset; } - .buttonRow > div > img { grid-area: img; } .buttonRow > div > .stats { grid-area: coins; } .buttonRow > div > .desc { display: contents; } /* .buttonRow > div > .stats { line-height: 1em; } */ + + .buttonRow > .buildingPurchaseAvailable.goldBuild { + border-color: gold; + background-color: #1f1a00; + color: gold; + } + + .buttonRow > .buildingPurchaseAvailable.yellowBuild { + border-color: yellow; + background-color: #242400; + color: yellow; + } + + .buttonRow > .buildingPurchaseAvailable.pinkBuild { + border-color: pink; + background-color: #291e20; + color: pink; + } + + .buttonRow > .buildingPurchaseAvailable.cyanBuild { + border-color: cyan; + background-color: #002424; + color: cyan; + } + + .buttonRow > .buildingPurchaseAvailable.plumBuild { + border-color: plum; + background-color: #1a091a; + color: plum; + } + + .buttonRow > .buildingPurchaseAvailable.limegreenBuild { + border-color: limegreen; + background-color: #071d07; + color: limegreen; + } + + .buttonRow > .buildingPurchaseAvailable.orangeBuild { + border-color: orange; + background-color: #241700; + color: orange; + } + + .buttonRow > .buildingPurchaseAvailable > img { filter: unset; } + + .buildingPurchaseAvailable { cursor: pointer; } + .buildingPurchaseAvailable > .buildingPurchaseBtn:hover { background-color: unset; } + + .resetautomation { margin-top: 40px !important; } + #taxinfo { margin: 0; } + + #coinBuildings, + #prestige, + #transcension, + #reincarnation, + #ascension { + margin-bottom: 20px; + } } diff --git a/index.html b/index.html index 9c9197f2a..3ca9dd776 100644 --- a/index.html +++ b/index.html @@ -237,18 +237,14 @@
-
-
- - - - - - - - - -
One Coin BuildingTen Coin buildings100 Coin Buildings1000 Coin Buildings10000 Coin Building100000 Coin Building
+
+
+ One Coin Building + Ten Coin buildings + 100 Coin Buildings + 1000 Coin Buildings + 10000 Coin Building + 100000 Coin Building
-
- Worker - - Total: +
+ Worker + + Total: - - + +
-
- Investment - - Total: +
+ Investment + + Total: - - - 0 + + + 0
-
- Printer - - Total: +
+ Printer + + Total: - - - + + +
-
- Coin Mint - - Total: +
+ Coin Mint + + Total: - - - + + +
-
- Alchemy - - Total: +
+ Alchemy + + Total: - - - + + +
-
- Accelerator - Accelerators: 0 [+0] - - - Acceleration Factor: 10.0%. Acceleration Multiplier: 1.00x +
+ Accelerator + + Total: + + + + + || +
-
- Multiplier - Multipliers: 0 [+0] - - - +
+ Multiplier + + Total: + + + + + || +
-
- Accelerator Boost - Accelerator Boosts: 0 [+0] - - - Next one adds 1.00% Acceleration Factor. +
+ Accelerator Boost + + Total: + + + + Next one adds 1.00% Acceleration Factor.

-

-

+

+