No commit message

wet-boew · Jul 1, 2012 · d61285f · d61285f
1 parent 11d7975
commit d61285f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/demos/index-eng.html b/demos/index-eng.html
@@ -25,6 +25,7 @@
 <script src="../build/js/jquery.min.js"></script>
 <link rel="stylesheet" href="../build/grids/css/util-min.css" />
 <!--[if lte IE 8]>
+<script src="../build/js/polyfills/html5shiv-min.js"></script>
 <link rel="stylesheet" href="../build/js/css/pe-ap-ie-min.css" />
 <link rel="stylesheet" href="../build/theme-gcwu-fegc/css/theme-ie-min.css" />
 <![endif]-->
@@ -156,8 +157,14 @@ <h1 id="wb-cont">Working examples</h1>
 </ul>
 </section>
 </div>
-
 <div class="span-4">
+<section><h2 id="zebra">Lightbox</h2>
+<ul>
+<li><a href="lightbox/lightbox-eng.html"><span class="wb-invisible">Lightbox - </span>English examples</a></li>
+<li><a href="lightbox/lightbox-fra.html"><span class="wb-invisible">Lightbox - </span>French examples</a></li>
+</ul>
+</section>
+
 <section><h2 id="math">Mathematical/scientific formula display</h2>
 <ul>
 <li><a href="mathlib/mathlib-eng.html"><span class="wb-invisible">Mathematical/scientific formula display - </span>English examples</a></li>

diff --git a/demos/index-fra.html b/demos/index-fra.html
@@ -25,6 +25,7 @@
 <script src="../build/js/jquery.min.js"></script>
 <link rel="stylesheet" href="../build/grids/css/util-min.css" />
 <!--[if lte IE 8]>
+<script src="../build/js/polyfills/html5shiv-min.js"></script>
 <link rel="stylesheet" href="../build/js/css/pe-ap-ie-min.css" />
 <link rel="stylesheet" href="../build/theme-gcwu-fegc/css/theme-ie-min.css" />
 <![endif]-->
@@ -150,6 +151,7 @@ <h1 id="wb-cont">Exemples pratiques</h1>
 </ul>
 </section>
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <div id="cn-bc"><h2>Fil d'Ariane</h2><div id="cn-bc-inner">
 <ol>
@@ -176,6 +178,15 @@ <h1 id="cn-cont">Exemples pratiques - Boîte à outils de l’expérience Web (B
 
 <section><h2 id="menubar">Barre de menu</h2>
 =======
+=======
+<section><h2 id="tabs">Lightbox</h2>
+<ul>
+<li><a href="lightbox/lightbox-eng.html"><span class="wb-invisible">Lightbox - </span>Exemples en anglais</a></li>
+<li><a href="lightbox/lightbox-fra.html"><span class="wb-invisible">Lightbox - </span>Exemples en français</a></li>
+</ul>
+</section>
+
+>>>>>>> master
 <section><h2 id="texthighlight">Mise en surbrillance de texte</h2>
 >>>>>>> a0a767042c9f176db4166e2236d09b64cbbda6a3
 <ul>