Skip to content

Commit

Permalink
Asqatasun#136 - Webapp: fixed pt => px conversion ("Help" > "Text siz…
Browse files Browse the repository at this point in the history
…e understanding")
  • Loading branch information
dzc34 committed Apr 23, 2018
1 parent 209e91b commit ad7c882
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
12 changes: 6 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Contrast-Finder 0.8.7, 2018-0x-xx
Upgrade-o-meter: just replace the .war file and restart Tomcat

Thanks to:
- @ffoodd - Feature request #148

- @ffoodd - Feature request #148
- @ArnaudDelafosse - Issue #136 and PR #143

### New Feature
none
Expand All @@ -19,7 +19,7 @@ none
none

### Bug
none
- [#136 - Webapp: fixed pt => px conversion ("Help" > "Text size understanding")](https://github.com/Asqatasun/Contrast-Finder/issues/136)

### Improvement
- [#148 - Contrast calculation is visible without scrolling)](https://github.com/Asqatasun/Contrast-Finder/issues/148)
Expand All @@ -43,9 +43,9 @@ Contrast-Finder 0.8.6, 2018-04-14
Upgrade-o-meter: just replace the .war file and restart Tomcat

Thanks to:
- @ArnaudDelafosse for PR #142
- @Kaths31 for PR #147
- @miname for PR #144 and PR #145
- @ArnaudDelafosse - PR #142
- @Kaths31 - PR #147
- @miname - PR #144 and #145

### Outdated dependencies
- [#156 - Upgraded native2ascii-maven-plugin (2.0.1 instead of 2.0.0)](https://github.com/Asqatasun/Contrast-Finder/issues/156)
Expand Down
12 changes: 6 additions & 6 deletions webapp/src/main/resources/i18n/contrast-finder_utf8.properties
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ help.ratio=<p> Three possible values <strong>3</strong>, <strong>4.5</strong> an
<h4> Level <em>AA</em> </h4> \
<p> Two elements (size and bold) gives four combinations: </p> \
<ul> \
<li> Text not bold + text size &lt; <code>18px</code>: ratio = <strong>4.5</strong> </li> \
<li> Text not bold + text size &gt; <code>18px</code>: ratio = <strong>3</strong> </li> \
<li> Text bold + text size &lt; <code>14px</code>: ratio = <strong>4.5</strong> </li> \
<li> Text bold + text size &gt; <code>14px</code>: ratio = <strong>3</strong> </li> \
<li> Text not bold + text size &lt; <code>24px</code>: ratio = <strong>4.5</strong> </li> \
<li> Text not bold + text size &gt; <code>24px</code>: ratio = <strong>3</strong> </li> \
<li> Text bold + text size &lt; <code>19px</code>: ratio = <strong>4.5</strong> </li> \
<li> Text bold + text size &gt; <code>19px</code>: ratio = <strong>3</strong> </li> \
</ul> \
<h4> Level <em>AAA</em> </h4> \
<p> For level <strong>AAA</strong> the logic is the same, only the ratio increases in the the following way: </p> \
Expand All @@ -186,9 +186,9 @@ help.ratio=<p> Three possible values <strong>3</strong>, <strong>4.5</strong> an
</ul> \
<h4> Text size understanding </h4> \
<ul> \
<li> The <code>14px</code> criteria can be understood as equivalent \
<li> The <code>19px</code> criteria can be understood as equivalent \
of <code>14pt</code> or <code>120%</code> or <code>1.2em</code>. </li> \
<li> The <code>18px</code> criteria can be understood as equivalent \
<li> The <code>24px</code> criteria can be understood as equivalent \
of <code>18pt</code> or <code>150%</code> or <code>1.5em</code>. </li> \
</ul> \
<p> For a full and exhaustive understanding of how to interpret text size, one should read the \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ help.ratio=<p> Three possible values <strong>3</strong>, <strong>4.5</strong> an
<h4> Level <em>AA</em> </h4> \
<p> Two elements (size and bold) gives four combinations: </p> \
<ul> \
<li> Text not bold + text size &lt; <code>18px</code>: ratio = <strong>4.5</strong> </li> \
<li> Text not bold + text size &gt; <code>18px</code>: ratio = <strong>3</strong> </li> \
<li> Text bold + text size &lt; <code>14px</code>: ratio = <strong>4.5</strong> </li> \
<li> Text bold + text size &gt; <code>14px</code>: ratio = <strong>3</strong> </li> \
<li> Text not bold + text size &lt; <code>24px</code>: ratio = <strong>4.5</strong> </li> \
<li> Text not bold + text size &gt; <code>24px</code>: ratio = <strong>3</strong> </li> \
<li> Text bold + text size &lt; <code>19px</code>: ratio = <strong>4.5</strong> </li> \
<li> Text bold + text size &gt; <code>19px</code>: ratio = <strong>3</strong> </li> \
</ul> \
<h4> Level <em>AAA</em> </h4> \
<p> For level <strong>AAA</strong> the logic is the same, only the ratio increases in the the following way: </p> \
Expand All @@ -186,9 +186,9 @@ help.ratio=<p> Three possible values <strong>3</strong>, <strong>4.5</strong> an
</ul> \
<h4> Text size understanding </h4> \
<ul> \
<li> The <code>14px</code> criteria can be understood as equivalent \
<li> The <code>19px</code> criteria can be understood as equivalent \
of <code>14pt</code> or <code>120%</code> or <code>1.2em</code>. </li> \
<li> The <code>18px</code> criteria can be understood as equivalent \
<li> The <code>24px</code> criteria can be understood as equivalent \
of <code>18pt</code> or <code>150%</code> or <code>1.5em</code>. </li> \
</ul> \
<p> For a full and exhaustive understanding of how to interpret text size, one should read the \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ help.ratio=<p> \
<h4> Niveau <em>AA</em> </h4> \
<p> Deux éléments (la taille et la graisse du texte) donnent 4 combinaisons : </p> \
<ul> \
<li> Texte non gras + taille du texte &lt; <code>18px</code> : ratio = <strong>4.5</strong> </li> \
<li> Texte non gras + taille du texte &gt; <code>18px</code> : ratio = <strong>3</strong> </li> \
<li> Texte en gras + taille du texte &lt; <code>14px</code> : ratio = <strong>4.5</strong> </li> \
<li> Texte en gras + taille du texte &gt; <code>14px</code> : ratio = <strong>3</strong> </li> \
<li> Texte non gras + taille du texte &lt; <code>24px</code> : ratio = <strong>4.5</strong> </li> \
<li> Texte non gras + taille du texte &gt; <code>24px</code> : ratio = <strong>3</strong> </li> \
<li> Texte en gras + taille du texte &lt; <code>19px</code> : ratio = <strong>4.5</strong> </li> \
<li> Texte en gras + taille du texte &gt; <code>19px</code> : ratio = <strong>3</strong> </li> \
</ul> \
<h4> Niveau <em>AAA</em> </h4> \
<p> Pour le niveau <strong>AAA</strong>, la logique est la même avec une augmentation de la valeur des ratios : </p> \
Expand All @@ -194,9 +194,9 @@ help.ratio=<p> \
</ul> \
<h4> Interprétation de la taille des textes </h4> \
<ul> \
<li> Le critère <code>14px</code> peut être compris comme équivalent \
<li> Le critère <code>19px</code> peut être compris comme équivalent \
à <code>14pt</code> ou <code>120%</code> ou <code>1.2em</code>. </li> \
<li> Le critère <code>18px</code> peut être compris comme équivalent \
<li> Le critère <code>24px</code> peut être compris comme équivalent \
à <code>18pt</code> ou <code>150%</code> ou <code>1.5em</code>. </li> \
</ul> \
<p> \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,10 @@ help.ratio=<p> \
<h4> 레벨 <em>AA</em> </h4> \
<p> 두 가지 요소(크기와 볼드 유무)에 따라 다음과 같은 네 가지 조합을 도출할 수 있습니다: </p> \
<ul> \
<li> 볼드체가 아닌 글자 + 글자 크기 &lt; <code>18px</code>: 비율 = <strong>4.5</strong> </li> \
<li> 볼드체가 아닌 글자 + 글자 크기 &gt; <code>18px</code>: 비율 = <strong>3</strong> </li> \
<li> 볼드체 글자 + 글자 크기 &lt; <code>14px</code>: 비율 = <strong>4.5</strong> </li> \
<li> 볼드체 글자 + 글자 크기 &gt; <code>14px</code>: 비율 = <strong>3</strong> </li> \
<li> 볼드체가 아닌 글자 + 글자 크기 &lt; <code>24px</code>: 비율 = <strong>4.5</strong> </li> \
<li> 볼드체가 아닌 글자 + 글자 크기 &gt; <code>24px</code>: 비율 = <strong>3</strong> </li> \
<li> 볼드체 글자 + 글자 크기 &lt; <code>19px</code>: 비율 = <strong>4.5</strong> </li> \
<li> 볼드체 글자 + 글자 크기 &gt; <code>19px</code>: 비율 = <strong>3</strong> </li> \
</ul> \
<h4> 레벨 <em>AAA</em> </h4> \
<p> 레벨 <strong>AAA</strong>의 원리는 같으나, 비율만 다음과 같이 증가합니다: </p> \
Expand All @@ -191,9 +191,9 @@ help.ratio=<p> \
</ul> \
<h4> 글자 크기의 이해 </h4> \
<ul> \
<li> <code>14px</code> 정도의 크기는 <code>14pt</code> 또는 \
<li> <code>19px</code> 정도의 크기는 <code>14pt</code> 또는 \
<code>120%</code> 혹은 <code>1.2em</code> 크기와 같은 것으로 칩니다. </li> \
<li> <code>18px</code> 정도의 크기는 <code>18pt</code> 또는 \
<li> <code>24px</code> 정도의 크기는 <code>18pt</code> 또는 \
<code>150%</code> 혹은 <code>1.5em</code> 크기와 같은 것으로 칩니다. </li> \
</ul> \
<p> \
Expand Down

0 comments on commit ad7c882

Please sign in to comment.