Merge branch 'fix/c1-selectable-zero-postion' of LInE/Ifractions-web into develop

README.md

@@ -46,7 +46,7 @@ Follow the description below based on in which platform you want to run iFractio
 
 ## Releases:
 
-### [v3.1.0](http://200.144.254.107/git/LInE/Ifractions-web/src/release-3.1.0) (stable)
+### [v3.1.1](http://200.144.254.107/git/LInE/Ifractions-web/src/release-3.1.1) (stable)
 
 * Bug fixes 
 

index.html

@@ -43,6 +43,57 @@
 
     </div>
 
+    <!-- Information -->
+
+    <div class="panel panel-info">
+      <div class="panel-heading ifr-cardInfo__heading">
+        <span>
+          🇺🇸&nbsp;&nbsp;More information about the iFractions Project
+        </span>
+        <img src="./assets/img/info_cards/mini_games.png" width="100px" title="Examples of iFractions mini-games" />
+      </div>
+      <div class="panel-body">
+        <ul>
+          <li>Free software to promote learning with private data!</li>
+          <li>Developed by
+            <a href="https://www.usp.br/line" class="ref2" title="LInE's web page" target="_blank">Laboratory of
+              Informatics in Education</a>.
+          </li>
+          <li>For more information about mini-games to introduce fractions see the <a href="about/"
+              title="see documentation">iFractions documentation</a>.
+          </li>
+          <li>If you are a developer interested in colaborating with the project, see the <a
+              href="about/paginas/documentacao.html#sou-dev" title="see documentation to developers">Development
+              section</a> of the documentation.
+          </li>
+        </ul>
+        <!-- <a href="ifractions_www.tgz" title="download to use in your computer, school...">download</a> -->
+      </div>
+    </div>
+
+    <div class="panel panel-info">
+      <div class="panel-heading ifr-cardInfo__heading">
+        <span>🇧🇷&nbsp;&nbsp;Mais informações sobre o Projeto iFrações</span>
+        <img src="./assets/img/info_cards/mini_games.png" width="100px" title="Examples of iFractions mini-games" />
+      </div>
+      <div class="panel-body">
+        <ul>
+          <li><em>Software</em> livre para promover aprendizado mantendo dados privativo!</li>
+          <li>Desenvolvido pelo
+            <a href="https://www.usp.br/line" class="ref2" title="Página web do LInE" target="_blank">Laboratorio de
+              Informática na Educação</a>.
+          </li>
+          <li>Para mais informações sobre mini-jogos para
+            introduzir
+            frações veja a <a href="about/" title="see documentation">documentação do iFrações</a>.</li>
+          <li>Se você é um programador interessado em colaborar com o projeto, veja a <a
+              href="about/paginas/documentacao.html#sou-dev" title="veja documentação para desenvolvedores">sessão de
+              desenvolvimento</a> da documentação.
+          </li>
+        </ul>
+      </div>
+    </div>
+
     <!-- Load all js files -->
     <script src="./js/menus/preMenu_boot.js"></script>
     <script src="./js/menus/preMenu_lang.js"></script>

js/games/circleOne.js

@@ -500,7 +500,8 @@ const circleOne = {
         self.circles.list[0].info.distance * self.circles.list[0].info.direc;
 
       let isBeforeMin = (isAfterMax = false);
-      let finalPosition = self.control.correctX.toFixed(1);
+      let finalPosition = Number(self.control.correctX.toFixed(1));
+      const extraPixels = gameOperation === 'mixed' ? 5 : 0;
       // Restart if
       // In Game mode 'a' and 'b' : Kite position is out of bounds
       if (gameOperation === 'minus') {
@@ -508,7 +509,7 @@ const circleOne = {
         isAfterMax =
           finalPosition < validPath.x0 - 5 * validPath.distanceBetweenPoints;
       } else {
-        isBeforeMin = finalPosition <= validPath.x0;
+        isBeforeMin = finalPosition - extraPixels <= validPath.x0;
         isAfterMax =
           finalPosition > validPath.x0 + 5 * validPath.distanceBetweenPoints;
       }

style/IFractions.css

@@ -120,4 +120,10 @@
 
 .ifr-infoBox__menu__img {
   width: 60%; 
+}
+
+.ifr-cardInfo__heading {
+  display: flex;
+  justify-content: space-between;
+  align-items: center
 }