Skip to content

Commit

Permalink
Merge branch 'master' of github.com:wet-boew/wet-boew into feature-mu…
Browse files Browse the repository at this point in the history
…ltimedia-player

Conflicts:
	build/js/pe-ap-min.js
  • Loading branch information
LaurentGoderre committed Aug 14, 2012
2 parents 2248768 + 34b236d commit 6581b68
Show file tree
Hide file tree
Showing 29 changed files with 1,548 additions and 234 deletions.
2 changes: 1 addition & 1 deletion build/grids/css/util-ie-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/grids/css/util-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/css/pe-ap-ie-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/css/pe-ap-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/pe-ap-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/polyfills/progress-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/theme-gcwu-fegc/css/theme-min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions demos/index-eng.html
Expand Up @@ -200,10 +200,10 @@ <h1 id="wb-cont">Working examples</h1>
</ul>
</section>

<section><h2 id="math">Mathematical/scientific formula display (Alpha)</h2>
<section><h2 id="math">Mathematical/scientific formula display (MathML polyfill) (Alpha)</h2>
<ul>
<li><a href="mathlib/mathlib-eng.html"><span class="wb-invisible">Mathematical/scientific formula display - </span>English examples</a></li>
<li><a href="mathlib/mathlib-fra.html"><span class="wb-invisible">Mathematical/scientific formula display - </span>French examples</a></li>
<li><a href="mathlib/mathlib-eng.html"><span class="wb-invisible">Mathematical/scientific formula display (MathML polyfill) - </span>English examples</a></li>
<li><a href="mathlib/mathlib-fra.html"><span class="wb-invisible">Mathematical/scientific formula display (MathML polyfill) - </span>French examples</a></li>
</ul>
</section>
</div>
Expand Down
6 changes: 3 additions & 3 deletions demos/index-fra.html
Expand Up @@ -98,10 +98,10 @@ <h1 id="wb-cont">Exemples pratiques</h1>

<div class="span-4">

<section><h2 id="math">Affichage des formules mathématiques ou scientifiques (Alpha)</h2>
<section><h2 id="math">Affichage des formules mathématiques ou scientifiques (correctif pour MathML) (Alpha)</h2>
<ul>
<li><a href="mathlib/mathlib-eng.html"><span class="wb-invisible">Affichage des formules mathématiques ou scientifiques - </span>Exemples en anglais</a></li>
<li><a href="mathlib/mathlib-fra.html"><span class="wb-invisible">Affichage des formules mathématiques ou scientifiques - </span>Exemples en français</a></li>
<li><a href="mathlib/mathlib-eng.html"><span class="wb-invisible">Affichage des formules mathématiques ou scientifiques (correctif pour MathML) - </span>Exemples en anglais</a></li>
<li><a href="mathlib/mathlib-fra.html"><span class="wb-invisible">Affichage des formules mathématiques ou scientifiques (correctif pour MathML) - </span>Exemples en français</a></li>
</ul>
</section>

Expand Down
8 changes: 3 additions & 5 deletions demos/mathlib/mathlib-eng.html
Expand Up @@ -8,7 +8,7 @@
<meta charset="utf-8" />
<!-- Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
www.tbs.gc.ca/ws-nw/wet-boew/terms / www.sct.gc.ca/ws-nw/wet-boew/conditions -->
<title>Mathematical/scientific formula display - Working examples - Web Experience Toolkit (WET)</title>
<title>Mathematical/scientific formula display (MathML polyfill) - Working examples - Web Experience Toolkit (WET)</title>

<link rel="shortcut icon" href="../../build/theme-gcwu-fegc/images/favicon.ico" />
<meta name="description" content="English description / Description en anglais" />
Expand Down Expand Up @@ -86,7 +86,7 @@
<ol>
<li><a href="../../docs/index-eng.html">Home</a></li>
<li><a href="../index-eng.html">Working examples</a></li>
<li>Mathematical/scientific formula display</li>
<li>Mathematical/scientific formula display (MathML polyfill)</li>
</ol>
</div></div>
</nav>
Expand All @@ -96,9 +96,8 @@
<div id="wb-core"><div id="wb-core-in" class="equalize">
<div id="wb-main" role="main"><div id="wb-main-in">
<!-- MainContentStart -->
<h1 id="wb-cont">Mathematical/scientific formula display</h1>
<h1 id="wb-cont">Mathematical/scientific formula display (MathML polyfill)</h1>

<div class="wet-boew-mathlib">
<section><h2>Examples of simple formulas</h2>

<p>
Expand Down Expand Up @@ -1419,7 +1418,6 @@ <h1 id="wb-cont">Mathematical/scientific formula display</h1>
</tbody>
</table>
</section>
</div>

<dl id="gcwu-date-mod" role="contentinfo">
<dt>Date modified:</dt><dd><span><time>2011-10-31</time></span></dd>
Expand Down
8 changes: 3 additions & 5 deletions demos/mathlib/mathlib-fra.html
Expand Up @@ -8,7 +8,7 @@
<meta charset="utf-8" />
<!-- Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
www.tbs.gc.ca/ws-nw/wet-boew/terms / www.sct.gc.ca/ws-nw/wet-boew/conditions -->
<title>Affichage des formules mathématiques ou scientifiques - Exemples pratiques - Boîte à outils de l'expérience Web (BOEW)</title>
<title>Affichage des formules mathématiques ou scientifiques (correctif pour MathML) - Exemples pratiques - Boîte à outils de l'expérience Web (BOEW)</title>

<link rel="shortcut icon" href="../../build/theme-gcwu-fegc/images/favicon.ico" />
<meta name="description" content="French description / Description en français" />
Expand Down Expand Up @@ -86,7 +86,7 @@
<ol>
<li><a href="../../docs/index-fra.html">Accueil</a></li>
<li><a href="../index-fra.html">Exemples pratiques</a></li>
<li>Affichage des formules mathématiques ou scientifiques</li>
<li>Affichage des formules mathématiques ou scientifiques (correctif pour MathML)</li>
</ol></div></div>
</nav>
<!-- HeaderEnd -->
Expand All @@ -95,9 +95,8 @@
<div id="wb-core"><div id="wb-core-in" class="equalize">
<div id="wb-main" role="main"><div id="wb-main-in">
<!-- MainContentStart -->
<h1 id="wb-cont">Affichage des formules mathématiques ou scientifiques</h1>
<h1 id="wb-cont">Affichage des formules mathématiques ou scientifiques (correctif pour MathML)</h1>

<div class="wet-boew-mathlib">
<section><h2>Exemples de formules simples</h2>

<p>
Expand Down Expand Up @@ -1418,7 +1417,6 @@ <h1 id="wb-cont">Affichage des formules mathématiques ou scientifiques</h1>
</tbody>
</table>
</section>
</div>

<dl id="gcwu-date-mod" role="contentinfo">
<dt>Date de modification&#160;:</dt><dd><span><time>2011-10-31</time></span></dd>
Expand Down
5 changes: 5 additions & 0 deletions demos/progress/progress-eng.html
Expand Up @@ -34,6 +34,11 @@
<!--<![endif]-->

<!-- CustomScriptsCSSStart -->
<style>
progress {
width: 10em;
}
</style>
<!-- CustomScriptsCSSEnd -->
</head>

Expand Down
5 changes: 5 additions & 0 deletions demos/progress/progress-fra.html
Expand Up @@ -34,6 +34,11 @@
<!--<![endif]-->

<!-- CustomScriptsCSSStart -->
<style>
progress {
width: 10em;
}
</style>
<!-- CustomScriptsCSSEnd -->
</head>

Expand Down
35 changes: 34 additions & 1 deletion demos/zebra/zebra-eng.html
Expand Up @@ -415,7 +415,40 @@ <h1 id="wb-cont">Zebra striping - Web Experience Toolkit (WET)</h1>
</li>
</ol>
</section></div>
</section>

<div class="clear"></div>




<div class="span-4"><section><h3>List with <code>wet-boew-zebra</code> and <code>alterwg</code> class</h3>
<ol class="wet-boew-zebra alterwg">
<li>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam condimentum massa quis velit rutrum commodo.</li>
<li>Duis dictum lacus ac turpis gravida in interdum mauris adipiscing. Mauris leo lorem, lobortis eu malesuada a, molestie sed eros.</li>
<li>Vestibulum et dui ut velit dictum iaculis. Curabitur auctor viverra rutrum. Quisque id quam urna. Mauris quis urna in leo accumsan ultricies vitae sit amet felis.</li>
<li>Ut vel risus tellus. Suspendisse potenti. Sed est urna, venenatis at auctor eu, vulputate bibendum sem.</li>
<li>Aliquam erat volutpat. Maecenas aliquam dignissim urna nec viverra. Nulla fringilla fringilla orci, eget consectetur massa vulputate in. Morbi consectetur aliquam lacus, nec sollicitudin lorem molestie ut. Pellentesque scelerisque nulla eget mauris eleifend ac rutrum ligula scelerisque.</li>
<li>Aenean id elit in metus consectetur bibendum non at massa. Phasellus dictum varius nibh vel scelerisque. Curabitur sollicitudin purus urna, ac ullamcorper magna.</li>
<li>Phasellus accumsan risus id lacus cursus vitae fringilla sapien pulvinar. Duis viverra consectetur quam vitae pellentesque. Donec iaculis diam eget sem bibendum consequat. Nullam rhoncus bibendum lobortis. Sed consequat sagittis pharetra. Pellentesque accumsan, felis ut venenatis semper, metus odio sollicitudin libero, nec vestibulum lectus nibh vel libero. Fusce iaculis lectus vel ipsum auctor porta. Proin nec lectus augue, varius cursus orci.</li>
</ol>
</section></div>



<div class="span-4"><section><h3>List with <code>wet-boew-zebra</code>, <code>alterwg</code>, <code>nomargin</code> and <code>nohover</code> class</h3>
<ol class="wet-boew-zebra alterwg nomargin nohover">
<li>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam condimentum massa quis velit rutrum commodo.</li>
<li>Duis dictum lacus ac turpis gravida in interdum mauris adipiscing. Mauris leo lorem, lobortis eu malesuada a, molestie sed eros.</li>
<li>Vestibulum et dui ut velit dictum iaculis. Curabitur auctor viverra rutrum. Quisque id quam urna. Mauris quis urna in leo accumsan ultricies vitae sit amet felis.</li>
<li>Ut vel risus tellus. Suspendisse potenti. Sed est urna, venenatis at auctor eu, vulputate bibendum sem.</li>
<li>Aliquam erat volutpat. Maecenas aliquam dignissim urna nec viverra. Nulla fringilla fringilla orci, eget consectetur massa vulputate in. Morbi consectetur aliquam lacus, nec sollicitudin lorem molestie ut. Pellentesque scelerisque nulla eget mauris eleifend ac rutrum ligula scelerisque.</li>
<li>Aenean id elit in metus consectetur bibendum non at massa. Phasellus dictum varius nibh vel scelerisque. Curabitur sollicitudin purus urna, ac ullamcorper magna.</li>
<li>Phasellus accumsan risus id lacus cursus vitae fringilla sapien pulvinar. Duis viverra consectetur quam vitae pellentesque. Donec iaculis diam eget sem bibendum consequat. Nullam rhoncus bibendum lobortis. Sed consequat sagittis pharetra. Pellentesque accumsan, felis ut venenatis semper, metus odio sollicitudin libero, nec vestibulum lectus nibh vel libero. Fusce iaculis lectus vel ipsum auctor porta. Proin nec lectus augue, varius cursus orci.</li>
</ol>
</section></div>




<dl id="gcwu-date-mod" role="contentinfo">
<dt>Date modified:</dt><dd><span><time>2011-10-31</time></span></dd>
Expand Down
42 changes: 41 additions & 1 deletion demos/zebra/zebra-fra.html
Expand Up @@ -414,7 +414,47 @@ <h1 id="wb-cont">Rayage du zèbre</h1>
</li>
</ol>
</section></div>
</section>




<div class="clear"></div>




<div class="span-4"><section><h3>Liste avec la classe &#171;&#160;<code lang="en">wet-boew-zebra</code>&#160;&#187; et &#171;&#160;<code lang="en">alterwg</code>&#160;&#187;</h3>
<ol class="wet-boew-zebra alterwg">
<li>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam condimentum massa quis velit rutrum commodo.</li>
<li>Duis dictum lacus ac turpis gravida in interdum mauris adipiscing. Mauris leo lorem, lobortis eu malesuada a, molestie sed eros.</li>
<li>Vestibulum et dui ut velit dictum iaculis. Curabitur auctor viverra rutrum. Quisque id quam urna. Mauris quis urna in leo accumsan ultricies vitae sit amet felis.</li>
<li>Ut vel risus tellus. Suspendisse potenti. Sed est urna, venenatis at auctor eu, vulputate bibendum sem.</li>
<li>Aliquam erat volutpat. Maecenas aliquam dignissim urna nec viverra. Nulla fringilla fringilla orci, eget consectetur massa vulputate in. Morbi consectetur aliquam lacus, nec sollicitudin lorem molestie ut. Pellentesque scelerisque nulla eget mauris eleifend ac rutrum ligula scelerisque.</li>
<li>Aenean id elit in metus consectetur bibendum non at massa. Phasellus dictum varius nibh vel scelerisque. Curabitur sollicitudin purus urna, ac ullamcorper magna.</li>
<li>Phasellus accumsan risus id lacus cursus vitae fringilla sapien pulvinar. Duis viverra consectetur quam vitae pellentesque. Donec iaculis diam eget sem bibendum consequat. Nullam rhoncus bibendum lobortis. Sed consequat sagittis pharetra. Pellentesque accumsan, felis ut venenatis semper, metus odio sollicitudin libero, nec vestibulum lectus nibh vel libero. Fusce iaculis lectus vel ipsum auctor porta. Proin nec lectus augue, varius cursus orci.</li>
</ol>
</section></div>



<div class="span-4"><section><h3>Liste avec la classe &#171;&#160;<code lang="en">wet-boew-zebra</code>&#160;&#187;, &#171;&#160;<code lang="en">alterwg</code>&#160;&#187;, &#171;&#160;<code lang="en">nomargin</code>&#160;&#187; et &#171;&#160;<code lang="en">nohover</code>&#160;&#187;</h3>
<ol class="wet-boew-zebra alterwg nomargin nohover">
<li>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam condimentum massa quis velit rutrum commodo.</li>
<li>Duis dictum lacus ac turpis gravida in interdum mauris adipiscing. Mauris leo lorem, lobortis eu malesuada a, molestie sed eros.</li>
<li>Vestibulum et dui ut velit dictum iaculis. Curabitur auctor viverra rutrum. Quisque id quam urna. Mauris quis urna in leo accumsan ultricies vitae sit amet felis.</li>
<li>Ut vel risus tellus. Suspendisse potenti. Sed est urna, venenatis at auctor eu, vulputate bibendum sem.</li>
<li>Aliquam erat volutpat. Maecenas aliquam dignissim urna nec viverra. Nulla fringilla fringilla orci, eget consectetur massa vulputate in. Morbi consectetur aliquam lacus, nec sollicitudin lorem molestie ut. Pellentesque scelerisque nulla eget mauris eleifend ac rutrum ligula scelerisque.</li>
<li>Aenean id elit in metus consectetur bibendum non at massa. Phasellus dictum varius nibh vel scelerisque. Curabitur sollicitudin purus urna, ac ullamcorper magna.</li>
<li>Phasellus accumsan risus id lacus cursus vitae fringilla sapien pulvinar. Duis viverra consectetur quam vitae pellentesque. Donec iaculis diam eget sem bibendum consequat. Nullam rhoncus bibendum lobortis. Sed consequat sagittis pharetra. Pellentesque accumsan, felis ut venenatis semper, metus odio sollicitudin libero, nec vestibulum lectus nibh vel libero. Fusce iaculis lectus vel ipsum auctor porta. Proin nec lectus augue, varius cursus orci.</li>
</ol>
</section></div>








<dl id="gcwu-date-mod" role="contentinfo">
<dt>Date de modification&#160;:</dt><dd><span><time>2011-10-31</time></span></dd>
Expand Down
2 changes: 1 addition & 1 deletion docs/tableparser/How-to-use-colgroup-element.html
Expand Up @@ -8,7 +8,7 @@
<meta charset="utf-8" />
<!-- Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
www.tbs.gc.ca/ws-nw/wet-boew/terms / www.sct.gc.ca/ws-nw/wet-boew/conditions -->
<title>&ldquo;Keys&rdquo; and &ldquo;Description&rdquo; cell in a table row - Table Usability - Web Experience Toolkit (WET)</title>
<title>Colgroup Example, working Docs - Table Usability - Web Experience Toolkit (WET)</title>



Expand Down

0 comments on commit 6581b68

Please sign in to comment.