# HG changeset patch
# User cavaliet
# Date 1372169596 -7200
# Node ID 0e2be7079c647295598db43c03640b19d93bbff9
# Parent  bf13361c0fee2f0f6d0b482906b5d1486ef7f1ab# Parent  e313de5394fca19b1850a24eed59315410724223
Merge with e313de5394fca19b1850a24eed59315410724223

diff -r bf13361c0fee -r 0e2be7079c64 integration/v2/18-19-20-21-collection_vue_mosaique.html
--- a/integration/v2/18-19-20-21-collection_vue_mosaique.html	Tue Jun 25 16:11:32 2013 +0200
+++ b/integration/v2/18-19-20-21-collection_vue_mosaique.html	Tue Jun 25 16:13:16 2013 +0200
@@ -30,17 +30,57 @@
                                 <tr>
                                     <th>Vignette :</th>
                                     <td>
-                                        <label class="styled-select">
-                                            <select>
+                                        <label class="no-margin styled-select">
+                                            <select class="w-192">
                                                 <option selected value="">Mosaïque</option>
-                                                <option value="/egonomy/allfragments/">Fragments</option>
+                                                <option value="/egonomy/allfragments/">Argumentaire</option>
                                             </select>
                                         </label>
                                     </td>
                                 </tr>
+                                <tr>
+                                    <th>Visibilité :</th>
+                                    <td>
+                                        <label class="no-margin styled-select">
+                                            <select class="w-192">
+                                                <option selected value="">Visible par moi uniquement</option>
+                                            </select>
+                                        </label>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th><label for="share-collection">Partager :</label></th>
+                                    <td>
+                                        <input id="share-collection" class="w-194" type="text" placeholder="http://">
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th colspan="2">Description :</th>
+                                </tr>
+                                <tr>
+                                    <td colspan="2">
+                                        <textarea name="" id=""></textarea>
+                                    </td>
+                                </tr>
                             </tbody>
                         </table>
                     </div>
+                     <ul class="list-projets-2 in-popin">
+                        <li>
+                            <div class="top clearfix">
+                                <img src="img/113x113.png" alt="">
+                                <img src="img/113x113-2.png" alt="">
+                            </div>
+                            <div class="mid">
+                                <h3>Collection n°1</h3>
+                                <p>par Hubert Trucchose</p>
+                            </div>
+                            <div class="bot clearfix">
+                                <img src="img/113x113.png" alt="">
+                                <img src="img/113x113-2.png" alt="">
+                            </div>
+                        </li>
+                    </ul>
                     <div class="buttons">
                         <a href="#" class="btn close-popin">Annuler</a>
                         <input class="btn" type="submit" value="Valider">
diff -r bf13361c0fee -r 0e2be7079c64 integration/v2/css/style.css
--- a/integration/v2/css/style.css	Tue Jun 25 16:11:32 2013 +0200
+++ b/integration/v2/css/style.css	Tue Jun 25 16:13:16 2013 +0200
@@ -166,7 +166,16 @@
 .block{display: block;}
 .popin-wrap, .popin{display: none;}
 .big-popin{width: 572px; margin-left: -286px;}
-
+.popin th{ vertical-align:middle;font-family: 'Lato'; font-size: 12px; font-weight: 300; width: 110px; text-align: left;}
+.popin .col-left{width: 316px; float: left; padding-left: 12px;}
+.w-192{width: 192px; margin: 0 !important;}
+.popin .col-left input[type=text]{width: 172px;}
+.no-margin{margin: 0 !important;}
+.big-popin table{border-spacing:0 5px;border-collapse:separate;}
+.big-popin textarea{width: 304px; max-width: 304px; height: 170px;}
+.list-projets-2.in-popin{float: right; display: inline-block; padding-right: 12px;}
+.list-projets-2.in-popin li{margin: 0;}
+.big-popin .buttons{clear: both; border-top: 1px solid #DDD; padding-top: 10px; padding-right: 12px;}
 .edition{background-color: #eee; padding: 0 28px; margin-bottom: 64px;}
 .edition .slideshow{ min-height: 80px; position:relative; padding: 24px 0;  text-align: center;}
 .slideshow .arrow-wrap{display: block;}
@@ -176,6 +185,7 @@
 .slideshow .share li{float: left; margin-left: 8px;}
 .image-wrap{display: inline-block;}
 .edition{font-family: 'Lato'; font-size: 14px; text-align: left;}
+.big-popin form{padding: 8px 0 20px 0;}
 
 .edition th{color: #777; min-width: 140px; }
 .edition td{width:100%;color: #000; line-height: 16px;}