contrast ratio correction

Asqatasun · Jun 17, 2014 · bb672d3 · bb672d3
1 parent b1e9b0a
commit bb672d3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/data/contrast-finder-module.html b/data/contrast-finder-module.html
@@ -79,15 +79,15 @@
             <label for="medium-size">
               <input type="radio" name="text-size" id="medium-size" value="med">
               <span id="medium-size-text">
-		14px &le; <span data-l10n-id="text"></span> &lt; 18px
+		14px &le; <span data-l10n-id="text"></span> &le; 18px
 	      </span>
             </label>
           </div>
           <div class="radio">
             <label for="big-size">
               <input type="radio" name="text-size" id="big-size" value="sup">
               <span id="big-size-text">
-		<span data-l10n-id="text"></span> &ge; 18px
+		<span data-l10n-id="text"></span> &gt; 18px
 	      </span>
             </label>
           </div>

diff --git a/data/js/contrast-finder-module.js b/data/js/contrast-finder-module.js
@@ -106,9 +106,9 @@ function getResultAndEmit(elem, emitString) {
 /********************************************************************/
 
 function getIndexofSelectBoxRatio(fontSize, fontWeight, computeRatio) {
-    if ((fontSize < 18 && fontWeight < 700 && computeRatio < 4.5) || (fontSize < 14 && fontWeight >= 700 && computeRatio < 4.5)) {
+    if ((fontSize <= 18 && fontWeight < 700 && computeRatio < 4.5) || (fontSize < 14 && fontWeight >= 700 && computeRatio < 4.5)) {
 	return "4.5";
-    } else if ((fontSize >= 18 && fontWeight < 700 && computeRatio < 3) || (fontSize >= 14 && fontWeight >= 700 && computeRatio < 3 )) {
+    } else if ((fontSize > 18 && fontWeight < 700 && computeRatio < 3) || (fontSize >= 14 && fontWeight >= 700 && computeRatio < 3 )) {
 	return "3";
     } else {
 	return "valid";

diff --git a/data/js/form.js b/data/js/form.js
@@ -342,22 +342,22 @@ function setRatioFieldsetParameters(fontSize, fontWeight) {
 	small.checked = true;
 	ratio = "4.5";
 	pickerTextSize = "inf";
-    } else if (fontSize >= 18 && fontWeight < 700) {
+    } else if (fontSize > 18 && fontWeight < 700) {
 	boldState.checked = false;
 	big.checked = true;
 	ratio = "3";
 	pickerTextSize = "sup";
-    } else if (fontSize >= 18 && fontWeight >= 700) {
+    } else if (fontSize > 18 && fontWeight >= 700) {
 	boldState.checked = true;
     	big.checked = true;
 	ratio = "3";
 	pickerTextSize = "sup";
-    } else if (fontSize >= 14 && fontSize < 18 && fontWeight < 700) {
+    } else if (fontSize >= 14 && fontSize <= 18 && fontWeight < 700) {
 	boldState.checked = false;
     	medium.checked = true;
 	ratio = "4.5";
 	pickerTextSize = "med";
-    } else if (fontSize >= 14 && fontSize < 18 && fontWeight >= 700) {
+    } else if (fontSize >= 14 && fontSize <= 18 && fontWeight >= 700) {
 	boldState.checked = true;
     	medium.checked = true;
 	ratio = "3";