diff --git a/changelog b/changelog index f909909..1fa63a1 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,7 @@ + v48 + Added: Icons to menu + Fixed: (i) centered + v47 Added: Forced Dark/Light mode Forced Language (depending on the language of the browser) diff --git a/css/brb.css b/css/brb.css index 947634c..7b9603a 100644 --- a/css/brb.css +++ b/css/brb.css @@ -60,23 +60,22 @@ body{ /* Šmol change */ .changelog{ position: absolute; + display: flex; + justify-content: center; + align-items: center; width: 75px; height: 75px; bottom: 10px; right: 10px; filter: drop-shadow(0 0 10px #000); - background: #0098FF; + background: #0377c4; border-radius: 50%; } .changelog svg{ - border-radius: 50%; - height: 99%; - filter: drop-shadow(0 0 10px #000); + height: 100%; + aspect-ratio: 1/1; + /*filter: drop-shadow(0 0 10px #000);*/ color: #fff; - transition: 0.5s; -} -.changelog:hover svg{ - color: #a33; } /* Ligt NODE */ diff --git a/css/menu.css b/css/menu.css index 4c34e87..9048141 100644 --- a/css/menu.css +++ b/css/menu.css @@ -28,6 +28,7 @@ .button.expand{ width: 100%; } + .fas{ position: relative; display: flex; @@ -47,12 +48,13 @@ ul{ list-style: none; position: absolute; top: 65px; - display: block; + display: flex; + flex-direction: row; background: #1b1b1b; width: 100%; text-align: center; - border-radius: 5px; - display: none; + border-radius: 10px; + /*display: none;*/ box-shadow: 0 3px 6px rgba(0,0,0,.3); padding-inline-start: 0px; } @@ -70,13 +72,14 @@ ul:before{ ul li{ line-height: 35px; cursor: pointer; - border-bottom: 1px solid rgba(255,255,255,.1); + border-right: 1px solid rgba(255,255,255,.1); + width: 25%; } ul li:hover:first-child{ - border-radius: 5px 5px 0 0; + border-radius: 10px 0 0 10px; } ul li:hover:last-child{ - border-radius: 0 0 5px 5px; + border-radius: 0 10px 10px 0; } ul li:hover{ box-shadow: inset 0 0 5px #33ff33, @@ -86,14 +89,20 @@ ul li:last-child{ border-bottom: none; } ul li a{ - display: block; - width: 100%; - height: 100%; + display: flex; + justify-content: center; + align-items: center; + width: 74px; + height: 74px; color: #fff; - padding: 8px 0; - font-size: 18px; + fill: #fff; text-decoration: none; } -ul li:hover a{ +ul li a svg{ + width: 50%; + height: 50%; + color: #fff; +} +ul li:hover a svg{ color: #44dd44; } \ No newline at end of file diff --git a/img/click.svg b/img/click.svg new file mode 100644 index 0000000..cd87363 --- /dev/null +++ b/img/click.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/shop.svg b/img/shop.svg new file mode 100644 index 0000000..782eb41 --- /dev/null +++ b/img/shop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/upgrade.svg b/img/upgrade.svg new file mode 100644 index 0000000..0526416 --- /dev/null +++ b/img/upgrade.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/js/fornum.js b/js/fornum.js index 16039dc..bddeb2d 100644 --- a/js/fornum.js +++ b/js/fornum.js @@ -1,17 +1,13 @@ -// Function to convert a number into a more readable format +//? Function to convert a number into a more readable format function fornum(num){ if(num<1000) return Math.floor(num); - else if(items.lang == 0){ - const suffixes = ['', ' tis', ' mil', ' mld', ' bil', ' bld', ' tril', ' trild', ' kvad', ' kvadld', ' quint', ' quintld', ' sext', ' sextld', ' sept', ' septld', ' okt', ' oktld', ' non', ' nonld', ' dec', ' decld', ' undec', ' undecld', ' duodec', ' duodecld', ' tredec', ' tredecld', ' kvaddec', ' kvaddecld', ' quintdec', ' quintdecld', ' sextdec', ' sextdecld', ' googol']; - let i = 0; - while (num >= 1000 && i < suffixes.length - 1) { - num /= 1000; - i++; - } - num = Math.floor(num * 10) / 10; - return num + suffixes[i]; - }else{ - const suffixes = ['', ' k', ' mil', ' bil', ' tri', ' quad', ' qui', ' sex', ' sep', ' oct', ' non', ' dec', ' und', ' duo', ' tre', ' qua', ' qui', ' sex', ' sep', ' oct', ' nov', ' vig', ' uvi', ' dvi', ' tvi', ' qvi', ' qv', ' svi', ' spv', ' ov', ' nv', ' cen', ' ucn', ' dcn', ' googol']; + else{ + const suffixes = ['', ' K', ' M', ' B', ' T', + ' aa', ' ab', ' ac', ' ad', ' ae', ' af', ' ag', ' ah', ' ai', ' aj', ' ak', ' al', ' am', ' an', ' ao', ' ap', ' aq', ' ar', ' as', ' at', ' au', ' av', ' aw', ' ax', ' ay', ' az', + ' ba', ' bb', ' bc', ' bd', ' be', ' bf', ' bg', ' bh', ' bi', ' bj', ' bk', ' bl', ' bm', ' bn', ' bo', ' bp', ' bq', ' br', ' bs', ' bt', ' bu', ' bv', ' bw', ' bx', ' by', ' bz', + ' ca', ' cb', ' cc', ' cd', ' ce', ' cf', ' cg', ' ch', ' ci', ' cj', ' ck', ' cl', ' cm', ' cn', ' co', ' cp', ' cq', ' cr', ' cs', ' ct', ' cu', ' cv', ' cw', ' cx', ' cy', ' cz', + ' da', ' db', ' dc', ' dd', ' de', ' df', ' dg', ' dh', ' di', ' dj', ' dk', ' dl', ' dm', ' dn', ' do', ' dp', ' dq', ' dr', ' ds', ' dt', ' du', ' dv', ' dw', ' dx', ' dy', ' dz']; + let i = 0; while (num >= 1000 && i < suffixes.length - 1) { num /= 1000; diff --git a/js/htmls.js b/js/htmls.js index f6b7830..705dfc9 100644 --- a/js/htmls.js +++ b/js/htmls.js @@ -1,3 +1,28 @@ +const menu = ` + +
+
Menu + + + + +
+ +
`; + const htmlTitle = `

BRB THE GAME

@@ -46,21 +71,7 @@ const htmlClicking = ` - -
-
Menu - - - - -
- -
`; + ${menu}`; const htmlShop = ` @@ -836,20 +847,7 @@ const htmlShop = ` -
-
Menu - - - - -
- -
+ ${menu} @@ -901,20 +899,7 @@ const htmlUpgrade = ` -
-
Menu - - - - -
- -
`; + ${menu}`; const htmlSettings = `
@@ -945,20 +930,7 @@ const htmlSettings = ` -
-
Menu - - - - -
- -
`; + ${menu}`; function toTitle(){ document.getElementById('link').href = '../css/title.css'; diff --git a/js/main.js b/js/main.js index 3cbeb59..a694dc8 100644 --- a/js/main.js +++ b/js/main.js @@ -51,13 +51,7 @@ function beriba(){ // Languages function checklang(){ if(navigator.language == 'cs' || navigator.language == 'cs-CZ'){ - shop.innerHTML = 'Obchod'; - upg.innerHTML = 'Vylepšení'; - sett.innerHTML = 'Nastavení'; }else{ - shop.innerHTML = 'Shop'; - upg.innerHTML = 'Upgrades'; - sett.innerHTML = 'Settings'; } } diff --git a/js/upgr.js b/js/upgr.js index 6f9d03e..73b43a3 100644 --- a/js/upgr.js +++ b/js/upgr.js @@ -16,11 +16,10 @@ function loadUpgrades(){ Mc1.innerHTML = `Vylepšení na kliky za
${fornum(10+(items.Mclick||1)*(items.Mclick||1)-1)} citrónů`; progva.innerHTML = `Máš ${items.token} lístků z ${1000*items.pres}!`; - presBT1.innerHTML = `1 Lístek za
${fornum(2000)} Citrónů`; ItsTime.innerHTML = `Pojďme jít!`; if(items.pres > 1) got.innerHTML = `Právě máš ${items.pres-1} Prestiž bodů`; - }else if(items.lang == 1){ // En + }else{ // En dislm.innerHTML = `You've got ${fornum(items.lemons)} lemons!`; disMcmake.innerHTML = `Every click gives you ${fornum((items.Mclick||1)*items.pres)} clicks!`; Mc1.innerHTML = `Upgrade for your clicks
for ${fornum(10+(items.Mclick||1)*(items.Mclick||1)-1)} lemons`;