From 9f5d3616cb0ed7d4c8135482dbe775ced78eb5fe Mon Sep 17 00:00:00 2001 From: Rasmus Luha Date: Sat, 24 Sep 2022 15:28:33 +0300 Subject: =?UTF-8?q?Rists=C3=B5na=20done=20ja=20global=20button=20Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rannak/algus/utlused/css/utlused.css | 18 ++++++++++++++++++ rannak/algus/utlused/index.html | 2 +- rannak/algus/utlused/js/main.js | 13 ++++++------- 3 files changed, 25 insertions(+), 8 deletions(-) (limited to 'rannak/algus/utlused') diff --git a/rannak/algus/utlused/css/utlused.css b/rannak/algus/utlused/css/utlused.css index 4f63f54..e7c5277 100644 --- a/rannak/algus/utlused/css/utlused.css +++ b/rannak/algus/utlused/css/utlused.css @@ -14,6 +14,24 @@ body { touch-action: none; } +.moveOn{ + display: inline-block; + border: none; + padding: 6px 12px; + margin-botton: 0; + font-size: 1rem; + font-weight: normal; + text-align: center; + cursor: pointer; + border-radius: 4px; + background-color: #4BB543; + color: white; +} + +button:disabled{ + opacity: 0.5; +} + /* later added stuff here */ .wrapper { diff --git a/rannak/algus/utlused/index.html b/rannak/algus/utlused/index.html index dbde986..f3e80f9 100644 --- a/rannak/algus/utlused/index.html +++ b/rannak/algus/utlused/index.html @@ -45,7 +45,7 @@
- Liigu Edasi +
diff --git a/rannak/algus/utlused/js/main.js b/rannak/algus/utlused/js/main.js index a67b6bd..4262d41 100644 --- a/rannak/algus/utlused/js/main.js +++ b/rannak/algus/utlused/js/main.js @@ -76,10 +76,9 @@ if (`${isMobile() ? 'mobile' : 'not mobile'}` == 'not mobile') { counter++; console.log("counter:", counter) if (counter == 6){ - const button = document.querySelector(".btn"); - button.classList.remove('disabled'); - button.setAttribute('aria-disabled', false); - console.log("done"); + const btn = document.querySelector(".moveOn"); + btn.disabled = false; + btn.onclick = () => location.href = "../../rolliValik"; } } // If isCorrectMatchingEnd } // Drop Func End @@ -179,9 +178,9 @@ else{ counter++; console.log("counter:", counter) if (counter == 6){ - const button = document.querySelector(".btn"); - button.parentElement.classList.remove('btn'); - button.setAttribute('aria-disabled', false); + const btn = document.querySelector(".moveOn"); + btn.disabled = false; + btn.onclick = () => location.href = "../../rolliValik"; } } -- cgit v1.2.3