From: nael Date: Wed, 17 Apr 2019 10:12:10 +0000 (+0200) Subject: WIP #2647 @1:00 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6a46b2d9da80f4bde007cfaf39146ec2cd767445;p=bonaquiz.git WIP #2647 @1:00 --- diff --git a/index.php b/index.php index 076e73b..6dc5112 100644 --- a/index.php +++ b/index.php @@ -166,7 +166,7 @@ $questions = [
-

The Bona 100‑year

+

The Bona 100–year

anniversary quiz

Think you know Bona?
Put it to the test by taking part in our short quiz.

Start diff --git a/js/bonaquiz.js b/js/bonaquiz.js index c2afd91..0cffd3a 100644 --- a/js/bonaquiz.js +++ b/js/bonaquiz.js @@ -2,7 +2,7 @@ $(function () { $(window).on('resize', resize); $(window).on('orientationchange', function () { - console.log('orientation'); + // console.log('orientation'); resize(); setTimeout(function () { @@ -73,7 +73,7 @@ function AfterTransition() { let circleSens = 1; // Détermine le sens de direction du cercle --> 2 Valeur possibles : 1 = dans le sens des aiguilles d'une montre OU 2 = sens inverse - let donutSize = 0.84; // Creer un effet de donut's --> Les valeurs vont de 0 à 1, --> valeur 0 annule l'effet de donut's + let donutSize = 0.85; // Creer un effet de donut's --> Les valeurs vont de 0 à 1, --> valeur 0 annule l'effet de donut's let animationDuration = 5; // Durée en seconde de l'animation @@ -122,7 +122,7 @@ function AfterTransition() { // choose percent radius of the donut circle function updateAngle() { - console.log('angle = ', window.angle); + // console.log('angle = ', window.angle); paper.clear(); sector(paper, paperWidth / 2, paperHeight / 2, paperRadius, donutRadius, window.angle, window.angleEnd, { fill: color, @@ -142,7 +142,7 @@ function AfterTransition() { } //startAngle = 90; //console.log('startAngle = ', startAngle); - console.log('endAngle = ',endAngle); + // console.log('endAngle = ',endAngle); // init radian let rad = Math.PI / 180; // first circle (bigger) @@ -172,7 +172,7 @@ function AfterTransition() { function displayProgress() { if ($('.section:visible').data("page") === 1) { - console.log('data-page =', $(this).attr('data-page')); + // console.log('data-page =', $(this).attr('data-page')); $('.progressbar').css('display', 'none'); } else { $('.progressbar').css('display', 'block'); @@ -204,7 +204,7 @@ function resize() { baseWidth += gutter * 2; baseHeight += gutter * 2; - console.log(baseWidth, baseHeight); + // console.log(baseWidth, baseHeight); // Work out how much content needs to be scaled down, if at all scale = Math.min(1, ww / baseWidth, wh / baseHeight); diff --git a/style/style.sass b/style/style.sass index cd00930..5fb52f1 100644 --- a/style/style.sass +++ b/style/style.sass @@ -16,18 +16,14 @@ $base-font-size: 16 // Default box-sizing: border-box font-weight: 300 -@font-face - font-family: Helvetica - src: url("../HelveticaNeueLight.woff") - html - font-family: Helvetica, sans-serif + font-family: roboto, sans-serif height: 100% max-height: 100% font-size: 16px body - font-family: Helvetica, sans-serif + font-family: roboto, sans-serif font-size: rem(30) height: 100% max-height: 100% @@ -53,6 +49,7 @@ body left: 50% transform: translateX(-50%) transform-origin: top center + overflow: hidden //width: 100% .active @@ -248,6 +245,7 @@ section font-size: rem(30) .correctAnswer + cursor: auto !important margin-top: 1em background: $green @@ -316,8 +314,9 @@ section font-size: rem(25) .answerCircle - border: solid 3px $green !important + border: solid 8px $green !important margin-top: 50px + cursor: auto !important #ResultsDesc margin: 2em 0 @@ -327,7 +326,7 @@ section svg position: absolute !important - top: 0 + top: 0 !important left: 50% !important transform: translateX(-50%) @@ -352,10 +351,9 @@ section justify-content: center align-items: center border: 5px solid rgba(255, 255, 255, 0.3) - .inner + font-size: 85px color: $darkblue - font-size: rem(30) .home @include breakpoint