--- a/integration/v2/01.html Tue Jun 18 11:48:49 2013 +0200
+++ b/integration/v2/01.html Tue Jun 18 13:29:25 2013 +0200
@@ -22,8 +22,15 @@
<div class="col-right">
<ul class="head-login clearfix">
<li>
- <form action="#">
- <p><input type="text" placeholder="Rechercher dans le site"></p>
+ <form method="GET" action="/egonomy/allpictures/">
+ <p>
+ <input id="id_search" type="text" placeholder="Rechercher dans le site">
+ <select class="search-type">
+ <option selected="" value="/egonomy/allpictures/">Images</option>
+ <option value="/egonomy/allfragments/">Fragments</option>
+ </select>
+ </p>
+ <input type="hidden" name="field" value="all">
</form>
</li>
<li class="hello-user">Bonjour Anthony Ly</li>
@@ -76,7 +83,17 @@
</div>
<ul class="list-projets clearfix">
<li>
- <img src="img/225x225.png" alt="">
+ <div class="fragment">
+ <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0.3548 0.232193846154 0.357 0.276812307692" height="100%" width="100%" preserveAspectRatio="none">
+ <defs>
+ <clipPath id="fragment-clip68">
+ <path d="M0.3548 0.2603L0.4172 0.4461L0.7053 0.4809L0.7118 0.3532Z"/>
+ </clipPath>
+ </defs>
+ <image opacity=".3" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+ <image clip-path="url(#fragment-clip68)" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+ </svg>
+ </div><!-- ./fragment -->
<div>
<h3>Annotez, échangez réagissez</h3>
<p>Partagez votre vision en décrivant les euvres, en les regroupant, devenez critique d’Art!</p>
@@ -84,7 +101,17 @@
</div>
</li>
<li>
- <img src="img/225x225.png" alt="">
+ <div class="fragment">
+ <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0.3548 0.232193846154 0.357 0.276812307692" height="100%" width="100%" preserveAspectRatio="none">
+ <defs>
+ <clipPath id="fragment-clip68">
+ <path d="M0.3548 0.2603L0.4172 0.4461L0.7053 0.4809L0.7118 0.3532Z"/>
+ </clipPath>
+ </defs>
+ <image opacity=".3" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+ <image clip-path="url(#fragment-clip68)" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+ </svg>
+ </div><!-- ./fragment -->
<div>
<h3>Annotez, échangez réagissez</h3>
<p>Partagez votre vision en décrivant les euvres, en les regroupant, devenez critique d’Art!</p>
@@ -92,7 +119,17 @@
</div>
</li>
<li>
- <img src="img/225x225.png" alt="">
+ <div class="fragment">
+ <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0.3548 0.232193846154 0.357 0.276812307692" height="100%" width="100%" preserveAspectRatio="none">
+ <defs>
+ <clipPath id="fragment-clip68">
+ <path d="M0.3548 0.2603L0.4172 0.4461L0.7053 0.4809L0.7118 0.3532Z"/>
+ </clipPath>
+ </defs>
+ <image opacity=".3" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+ <image clip-path="url(#fragment-clip68)" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+ </svg>
+ </div><!-- ./fragment -->
<div>
<h3>Annotez, échangez réagissez</h3>
<p>Partagez votre vision en décrivant les euvres, en les regroupant, devenez critique d’Art!</p>
@@ -100,7 +137,17 @@
</div>
</li>
<li>
- <img src="img/225x225.png" alt="">
+ <div class="fragment">
+ <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0.3548 0.232193846154 0.357 0.276812307692" height="100%" width="100%" preserveAspectRatio="none">
+ <defs>
+ <clipPath id="fragment-clip68">
+ <path d="M0.3548 0.2603L0.4172 0.4461L0.7053 0.4809L0.7118 0.3532Z"/>
+ </clipPath>
+ </defs>
+ <image opacity=".3" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+ <image clip-path="url(#fragment-clip68)" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+ </svg>
+ </div><!-- ./fragment -->
<div>
<h3>Annotez, échangez réagissez</h3>
<p>Partagez votre vision en décrivant les euvres, en les regroupant, devenez critique d’Art!</p>
--- a/integration/v2/02.html Tue Jun 18 11:48:49 2013 +0200
+++ b/integration/v2/02.html Tue Jun 18 13:29:25 2013 +0200
@@ -22,8 +22,15 @@
<div class="col-right">
<ul class="head-login clearfix">
<li>
- <form action="#">
- <p><input type="text" placeholder="Rechercher dans le site"></p>
+ <form method="GET" action="/egonomy/allpictures/">
+ <p>
+ <input id="id_search" type="text" placeholder="Rechercher dans le site">
+ <select class="search-type">
+ <option selected="" value="/egonomy/allpictures/">Images</option>
+ <option value="/egonomy/allfragments/">Fragments</option>
+ </select>
+ </p>
+ <input type="hidden" name="field" value="all">
</form>
</li>
<li class="hello-user">Bonjour Anthony Ly</li>
--- a/integration/v2/03.html Tue Jun 18 11:48:49 2013 +0200
+++ b/integration/v2/03.html Tue Jun 18 13:29:25 2013 +0200
@@ -22,8 +22,15 @@
<div class="col-right">
<ul class="head-login clearfix">
<li>
- <form action="#">
- <p><input type="text" placeholder="Rechercher dans le site"></p>
+ <form method="GET" action="/egonomy/allpictures/">
+ <p>
+ <input id="id_search" type="text" placeholder="Rechercher dans le site">
+ <select class="search-type">
+ <option selected="" value="/egonomy/allpictures/">Images</option>
+ <option value="/egonomy/allfragments/">Fragments</option>
+ </select>
+ </p>
+ <input type="hidden" name="field" value="all">
</form>
</li>
<li class="hello-user">Bonjour Anthony Ly</li>
--- a/integration/v2/05.html Tue Jun 18 11:48:49 2013 +0200
+++ b/integration/v2/05.html Tue Jun 18 13:29:25 2013 +0200
@@ -22,8 +22,15 @@
<div class="col-right">
<ul class="head-login clearfix">
<li>
- <form action="#">
- <p><input type="text" placeholder="Rechercher dans le site"></p>
+ <form method="GET" action="/egonomy/allpictures/">
+ <p>
+ <input id="id_search" type="text" placeholder="Rechercher dans le site">
+ <select class="search-type">
+ <option selected="" value="/egonomy/allpictures/">Images</option>
+ <option value="/egonomy/allfragments/">Fragments</option>
+ </select>
+ </p>
+ <input type="hidden" name="field" value="all">
</form>
</li>
<li class="hello-user">Bonjour Anthony Ly</li>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/integration/v2/06-07.html Tue Jun 18 13:29:25 2013 +0200
@@ -0,0 +1,358 @@
+<!DOCTYPE html>
+<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="description" content="eGonomy">
+ <title>eGonomy</title>
+
+ <link rel="stylesheet" href="css/reset.css">
+ <link rel="stylesheet" href="css/fonts.css">
+ <link rel="stylesheet" href="css/style.css">
+ <script src="js/vendor/modernizr-2.6.2.min.js"></script>
+</head>
+<body>
+ <div class="popin-wrap">
+ <div id="new-collection" class="popin popin-new-collection box-shadow">
+ <header>
+ <h2>nouvelle collection</h2>
+ <a href="#" class="close-popin"></a>
+ </header>
+ <section>
+ <form action="#">
+ <p>
+ <label for="collection-name">Nom de la collection :</label>
+ <input type="text" name="" id="collection-name">
+ </p>
+ <p>
+ <label class="block" for="collection-description">Description :</label>
+ <textarea name="" id="collection-description"></textarea>
+ </p>
+ <div class="buttons">
+ <a href="#" class="btn close-popin">Annuler</a>
+ <input class="btn" type="submit" value="Valider">
+ </div>
+ </form>
+ </section>
+ </div>
+ </div>
+
+ <div class="wrap">
+ <header class="clearfix">
+ <h1><a href="#">egonomy</a></h1>
+ <div class="col-right">
+ <ul class="head-login clearfix">
+ <li>
+ <form method="GET" action="/egonomy/allpictures/">
+ <p>
+ <input id="id_search" type="text" placeholder="Rechercher dans le site">
+ <select class="search-type">
+ <option selected="" value="/egonomy/allpictures/">Images</option>
+ <option value="/egonomy/allfragments/">Fragments</option>
+ </select>
+ </p>
+ <input type="hidden" name="field" value="all">
+ </form>
+ </li>
+ <li class="hello-user">Bonjour Anthony Ly</li>
+ <li><span class="dot-6"></span></li>
+ <li><a class="login" href="#">Déconnexion</a></li>
+ </ul>
+ <nav>
+ <ul class="nav clearfix">
+ <li><a href="#" title="home"><img src="img/icon-home.png" alt="home"></a></li>
+ <li><span class="dot-10"></span></li>
+ <li><a href="#">explorer</a></li>
+ <li><span class="dot-10"></span></li>
+ <li><a href="#">collectionner</a></li>
+ <li><span class="dot-10"></span></li>
+ <li><a href="#">créer</a></li>
+ <li><span class="dot-10"></span></li>
+ <li><a href="#">mon profil</a></li>
+ </ul>
+ <ul class="sub-nav clearfix">
+ <li><span class="dot-6"></span></li>
+ <li><a href="#" class="active">Mes collections</a></li>
+ <li><span class="dot-6"></span></li>
+ <li><a href="#">Mes collages</a></li>
+ <li><span class="dot-6"></span></li>
+ <li><a href="#">Mon profil</a></li>
+ </ul>
+ </nav>
+ </div>
+ </header>
+ <section>
+ <div class="title-page">
+ <h2>MES COLLECTIONS</h2>
+ </div>
+ <div class="bar-tools clearfix">
+ <h3>12 COLLECTIONS</h3>
+ <ul class="clearfix">
+ <li><a class="new-collection" href="#new-collection">Nouvelle collection</a></li>
+ </ul>
+ </div>
+
+ <ul class="list-projets-2 clearfix no-border-bot">
+ <li>
+ <div class="tools toggle">
+ <ul class="clearfix">
+ <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
+ </ul>
+ </div>
+ <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>
+ <li>
+ <div class="tools toggle">
+ <ul class="clearfix">
+ <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
+ </ul>
+ </div>
+ <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">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
+ </div>
+ </li>
+ <li>
+ <div class="tools toggle">
+ <ul class="clearfix">
+ <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
+ </ul>
+ </div>
+ <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>
+ <li>
+ <div class="tools toggle">
+ <ul class="clearfix">
+ <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
+ </ul>
+ </div>
+ <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">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
+ </div>
+ </li>
+ <li>
+ <div class="tools toggle">
+ <ul class="clearfix">
+ <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
+ </ul>
+ </div>
+ <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>
+ <li>
+ <div class="tools toggle">
+ <ul class="clearfix">
+ <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
+ </ul>
+ </div>
+ <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">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
+ </div>
+ </li>
+ <li>
+ <div class="tools toggle">
+ <ul class="clearfix">
+ <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
+ </ul>
+ </div>
+ <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>
+ <li>
+ <div class="tools toggle">
+ <ul class="clearfix">
+ <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
+ </ul>
+ </div>
+ <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">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
+ </div>
+ </li>
+ <li>
+ <div class="tools toggle">
+ <ul class="clearfix">
+ <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
+ </ul>
+ </div>
+ <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">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
+ </div>
+ </li>
+ <li>
+ <div class="tools toggle">
+ <ul class="clearfix">
+ <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
+ </ul>
+ </div>
+ <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">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
+ </div>
+ </li>
+ <li>
+ <div class="tools toggle">
+ <ul class="clearfix">
+ <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
+ </ul>
+ </div>
+ <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">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
+ </div>
+ </li>
+ <li>
+ <div class="tools toggle">
+ <ul class="clearfix">
+ <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
+ <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
+ </ul>
+ </div>
+ <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">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
+ </div>
+ </li>
+ </ul>
+
+
+ </section>
+ <footer class="clearfix">
+ <h6>EGONOMY est un projet de l’IRI et de la réunion des Musées Nationaux</h6>
+ <p>Mai 2013</p>
+ </footer>
+ </div><!-- /.wrap -->
+
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+ <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
+ <script src="js/masonry.min.js"></script>
+ <script src="js/main.js"></script>
+</body>
+</html>
--- a/integration/v2/06.html Tue Jun 18 11:48:49 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,347 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
-<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
-<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="description" content="eGonomy">
- <title>eGonomy</title>
-
- <link rel="stylesheet" href="css/reset.css">
- <link rel="stylesheet" href="css/fonts.css">
- <link rel="stylesheet" href="css/style.css">
- <script src="js/vendor/modernizr-2.6.2.min.js"></script>
-</head>
-<body>
- <div class="popin-wrap">
- <div class="popin popin-new-collection box-shadow">
- <header>
- <h2>nouvelle collection</h2>
- <a href="#" class="close-popin"></a>
- </header>
- <section>
- <form action="#">
- <label for="collection-name">Nom de la collection :</label>
- <input type="text" name="" id="collection-name">
-
- <label for="collection-description">Description :</label>
- <textarea name="" id="collection-description"></textarea>
- <div class="buttons">
- <a href="#" class="close-popin">Annuler</a>
- <input type="submit" value="Valider">
- </div>
- </form>
- </section>
- </div>
- </div>
- <div class="wrap">
- <header class="clearfix">
- <h1><a href="#">egonomy</a></h1>
- <div class="col-right">
- <ul class="head-login clearfix">
- <li>
- <form action="#">
- <p><input type="text" placeholder="Rechercher dans le site"></p>
- </form>
- </li>
- <li class="hello-user">Bonjour Anthony Ly</li>
- <li><span class="dot-6"></span></li>
- <li><a class="login" href="#">Déconnexion</a></li>
- </ul>
- <nav>
- <ul class="nav clearfix">
- <li><a href="#" title="home"><img src="img/icon-home.png" alt="home"></a></li>
- <li><span class="dot-10"></span></li>
- <li><a href="#">explorer</a></li>
- <li><span class="dot-10"></span></li>
- <li><a href="#">collectionner</a></li>
- <li><span class="dot-10"></span></li>
- <li><a href="#">créer</a></li>
- <li><span class="dot-10"></span></li>
- <li><a href="#">mon profil</a></li>
- </ul>
- <ul class="sub-nav clearfix">
- <li><span class="dot-6"></span></li>
- <li><a href="#" class="active">Mes collections</a></li>
- <li><span class="dot-6"></span></li>
- <li><a href="#">Mes collages</a></li>
- <li><span class="dot-6"></span></li>
- <li><a href="#">Mon profil</a></li>
- </ul>
- </nav>
- </div>
- </header>
- <section>
- <div class="title-page">
- <h2>MES COLLECTIONS</h2>
- </div>
- <div class="bar-tools clearfix">
- <h3>12 COLLECTIONS</h3>
- <ul class="clearfix">
- <li><a class="new-collection" href="#">Nouvelle collection</a></li>
- </ul>
- </div>
-
- <ul class="list-projets-2 clearfix no-border-bot">
- <li>
- <div class="tools toggle">
- <ul class="clearfix">
- <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
- </ul>
- </div>
- <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>
- <li>
- <div class="tools toggle">
- <ul class="clearfix">
- <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
- </ul>
- </div>
- <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">
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
- </div>
- </li>
- <li>
- <div class="tools toggle">
- <ul class="clearfix">
- <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
- </ul>
- </div>
- <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>
- <li>
- <div class="tools toggle">
- <ul class="clearfix">
- <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
- </ul>
- </div>
- <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">
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
- </div>
- </li>
- <li>
- <div class="tools toggle">
- <ul class="clearfix">
- <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
- </ul>
- </div>
- <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>
- <li>
- <div class="tools toggle">
- <ul class="clearfix">
- <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
- </ul>
- </div>
- <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">
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
- </div>
- </li>
- <li>
- <div class="tools toggle">
- <ul class="clearfix">
- <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
- </ul>
- </div>
- <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>
- <li>
- <div class="tools toggle">
- <ul class="clearfix">
- <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
- </ul>
- </div>
- <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">
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
- </div>
- </li>
- <li>
- <div class="tools toggle">
- <ul class="clearfix">
- <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
- </ul>
- </div>
- <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">
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
- </div>
- </li>
- <li>
- <div class="tools toggle">
- <ul class="clearfix">
- <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
- </ul>
- </div>
- <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">
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
- </div>
- </li>
- <li>
- <div class="tools toggle">
- <ul class="clearfix">
- <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
- </ul>
- </div>
- <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">
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
- </div>
- </li>
- <li>
- <div class="tools toggle">
- <ul class="clearfix">
- <li><a href="#"><img src="img/icon-twitter.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-facebook.png" alt=""></a></li>
- <li><a href="#"><img src="img/icon-save.png" alt=""></a></li>
- </ul>
- </div>
- <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">
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin fermentum egestas lobortis. Suspendisse imperdiet lobortis ligula, id laoreet nibh volutpat et. Nam ornare orci vitae nisi...</p>
- </div>
- </li>
- </ul>
-
-
- </section>
- <footer class="clearfix">
- <h6>EGONOMY est un projet de l’IRI et de la réunion des Musées Nationaux</h6>
- <p>Mai 2013</p>
- </footer>
- </div><!-- /.wrap -->
-
- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
- <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
- <script src="js/masonry.min.js"></script>
- <script src="js/main.js"></script>
-</body>
-</html>
--- a/integration/v2/css/fonts.css Tue Jun 18 11:48:49 2013 +0200
+++ b/integration/v2/css/fonts.css Tue Jun 18 13:29:25 2013 +0200
@@ -1,27 +1,12 @@
@font-face {
- font-family: 'josefin_sansbold';
+ font-family: 'josefin_sans';
src: url('fonts/josefinsans/josefinsans-bold-webfont.eot');
src: url('fonts/josefinsans/josefinsans-bold-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/josefinsans/josefinsans-bold-webfont.woff') format('woff'),
url('fonts/josefinsans/josefinsans-bold-webfont.ttf') format('truetype'),
url('fonts/josefinsans/josefinsans-bold-webfont.svg#josefin_sansbold') format('svg');
- font-weight: normal;
- font-style: normal;
-
-}
-
-
-
-
-@font-face {
- font-family: 'josefin_sansbold_italic';
- src: url('fonts/josefinsans/josefinsans-bolditalic-webfont.eot');
- src: url('fonts/josefinsans/josefinsans-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/josefinsans/josefinsans-bolditalic-webfont.woff') format('woff'),
- url('fonts/josefinsans/josefinsans-bolditalic-webfont.ttf') format('truetype'),
- url('fonts/josefinsans/josefinsans-bolditalic-webfont.svg#josefin_sansbold_italic') format('svg');
- font-weight: normal;
+ font-weight: bold;
font-style: normal;
}
@@ -30,14 +15,14 @@
@font-face {
- font-family: 'josefin_sansitalic';
- src: url('fonts/josefinsans/josefinsans-italic-webfont.eot');
- src: url('fonts/josefinsans/josefinsans-italic-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/josefinsans/josefinsans-italic-webfont.woff') format('woff'),
- url('fonts/josefinsans/josefinsans-italic-webfont.ttf') format('truetype'),
- url('fonts/josefinsans/josefinsans-italic-webfont.svg#josefin_sansitalic') format('svg');
- font-weight: normal;
- font-style: normal;
+ font-family: 'josefin_sans';
+ src: url('fonts/josefinsans/josefinsans-bolditalic-webfont.eot');
+ src: url('fonts/josefinsans/josefinsans-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/josefinsans/josefinsans-bolditalic-webfont.woff') format('woff'),
+ url('fonts/josefinsans/josefinsans-bolditalic-webfont.ttf') format('truetype'),
+ url('fonts/josefinsans/josefinsans-bolditalic-webfont.svg#josefin_sansbold_italic') format('svg');
+ font-weight: bold;
+ font-style: italic;
}
@@ -45,14 +30,14 @@
@font-face {
- font-family: 'josefin_sanslight';
- src: url('fonts/josefinsans/josefinsans-light-webfont.eot');
- src: url('fonts/josefinsans/josefinsans-light-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/josefinsans/josefinsans-light-webfont.woff') format('woff'),
- url('fonts/josefinsans/josefinsans-light-webfont.ttf') format('truetype'),
- url('fonts/josefinsans/josefinsans-light-webfont.svg#josefin_sanslight') format('svg');
+ font-family: 'josefin_sans';
+ src: url('fonts/josefinsans/josefinsans-italic-webfont.eot');
+ src: url('fonts/josefinsans/josefinsans-italic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/josefinsans/josefinsans-italic-webfont.woff') format('woff'),
+ url('fonts/josefinsans/josefinsans-italic-webfont.ttf') format('truetype'),
+ url('fonts/josefinsans/josefinsans-italic-webfont.svg#josefin_sansitalic') format('svg');
font-weight: normal;
- font-style: normal;
+ font-style: italic;
}
@@ -60,28 +45,13 @@
@font-face {
- font-family: 'josefin_sanslight_italic';
- src: url('fonts/josefinsans/josefinsans-lightitalic-webfont.eot');
- src: url('fonts/josefinsans/josefinsans-lightitalic-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/josefinsans/josefinsans-lightitalic-webfont.woff') format('woff'),
- url('fonts/josefinsans/josefinsans-lightitalic-webfont.ttf') format('truetype'),
- url('fonts/josefinsans/josefinsans-lightitalic-webfont.svg#josefin_sanslight_italic') format('svg');
- font-weight: normal;
- font-style: normal;
-
-}
-
-
-
-
-@font-face {
- font-family: 'josefin_sansregular';
- src: url('fonts/josefinsans/josefinsans-regular-webfont.eot');
- src: url('fonts/josefinsans/josefinsans-regular-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/josefinsans/josefinsans-regular-webfont.woff') format('woff'),
- url('fonts/josefinsans/josefinsans-regular-webfont.ttf') format('truetype'),
- url('fonts/josefinsans/josefinsans-regular-webfont.svg#josefin_sansregular') format('svg');
- font-weight: normal;
+ font-family: 'josefin_sans';
+ src: url('fonts/josefinsans/josefinsans-light-webfont.eot');
+ src: url('fonts/josefinsans/josefinsans-light-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/josefinsans/josefinsans-light-webfont.woff') format('woff'),
+ url('fonts/josefinsans/josefinsans-light-webfont.ttf') format('truetype'),
+ url('fonts/josefinsans/josefinsans-light-webfont.svg#josefin_sanslight') format('svg');
+ font-weight: 300;
font-style: normal;
}
@@ -90,14 +60,14 @@
@font-face {
- font-family: 'josefin_sanssemibold';
- src: url('fonts/josefinsans/josefinsans-semibold-webfont.eot');
- src: url('fonts/josefinsans/josefinsans-semibold-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/josefinsans/josefinsans-semibold-webfont.woff') format('woff'),
- url('fonts/josefinsans/josefinsans-semibold-webfont.ttf') format('truetype'),
- url('fonts/josefinsans/josefinsans-semibold-webfont.svg#josefin_sanssemibold') format('svg');
- font-weight: normal;
- font-style: normal;
+ font-family: 'josefin_sans';
+ src: url('fonts/josefinsans/josefinsans-lightitalic-webfont.eot');
+ src: url('fonts/josefinsans/josefinsans-lightitalic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/josefinsans/josefinsans-lightitalic-webfont.woff') format('woff'),
+ url('fonts/josefinsans/josefinsans-lightitalic-webfont.ttf') format('truetype'),
+ url('fonts/josefinsans/josefinsans-lightitalic-webfont.svg#josefin_sanslight_italic') format('svg');
+ font-weight: 300;
+ font-style: italic;
}
@@ -105,28 +75,25 @@
@font-face {
- font-family: 'josefin_sanssemibold_italic';
- src: url('fonts/josefinsans/josefinsans-semibolditalic-webfont.eot');
- src: url('fonts/josefinsans/josefinsans-semibolditalic-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/josefinsans/josefinsans-semibolditalic-webfont.woff') format('woff'),
- url('fonts/josefinsans/josefinsans-semibolditalic-webfont.ttf') format('truetype'),
- url('fonts/josefinsans/josefinsans-semibolditalic-webfont.svg#josefin_sanssemibold_italic') format('svg');
+ font-family: 'josefin_sans';
+ src: url('fonts/josefinsans/josefinsans-regular-webfont.eot');
+ src: url('fonts/josefinsans/josefinsans-regular-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/josefinsans/josefinsans-regular-webfont.woff') format('woff'),
+ url('fonts/josefinsans/josefinsans-regular-webfont.ttf') format('truetype'),
+ url('fonts/josefinsans/josefinsans-regular-webfont.svg#josefin_sansregular') format('svg');
font-weight: normal;
font-style: normal;
-
}
-
-
@font-face {
- font-family: 'josefin_sansthin';
- src: url('fonts/josefinsans/josefinsans-thin-webfont.eot');
- src: url('fonts/josefinsans/josefinsans-thin-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/josefinsans/josefinsans-thin-webfont.woff') format('woff'),
- url('fonts/josefinsans/josefinsans-thin-webfont.ttf') format('truetype'),
- url('fonts/josefinsans/josefinsans-thin-webfont.svg#josefin_sansthin') format('svg');
- font-weight: normal;
+ font-family: 'josefin_sans';
+ src: url('fonts/josefinsans/josefinsans-semibold-webfont.eot');
+ src: url('fonts/josefinsans/josefinsans-semibold-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/josefinsans/josefinsans-semibold-webfont.woff') format('woff'),
+ url('fonts/josefinsans/josefinsans-semibold-webfont.ttf') format('truetype'),
+ url('fonts/josefinsans/josefinsans-semibold-webfont.svg#josefin_sanssemibold') format('svg');
+ font-weight: 600;
font-style: normal;
}
@@ -135,67 +102,101 @@
@font-face {
- font-family: 'josefin_sansthin_italic';
+ font-family: 'josefin_sans';
+ src: url('fonts/josefinsans/josefinsans-semibolditalic-webfont.eot');
+ src: url('fonts/josefinsans/josefinsans-semibolditalic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/josefinsans/josefinsans-semibolditalic-webfont.woff') format('woff'),
+ url('fonts/josefinsans/josefinsans-semibolditalic-webfont.ttf') format('truetype'),
+ url('fonts/josefinsans/josefinsans-semibolditalic-webfont.svg#josefin_sanssemibold_italic') format('svg');
+ font-weight: 600;
+ font-style: italic;
+
+}
+
+
+
+
+@font-face {
+ font-family: 'josefin_sans';
+ src: url('fonts/josefinsans/josefinsans-thin-webfont.eot');
+ src: url('fonts/josefinsans/josefinsans-thin-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/josefinsans/josefinsans-thin-webfont.woff') format('woff'),
+ url('fonts/josefinsans/josefinsans-thin-webfont.ttf') format('truetype'),
+ url('fonts/josefinsans/josefinsans-thin-webfont.svg#josefin_sansthin') format('svg');
+ font-weight: 100;
+ font-style: normal;
+
+}
+
+
+
+
+@font-face {
+ font-family: 'josefin_sans';
src: url('fonts/josefinsans/josefinsans-thinitalic-webfont.eot');
src: url('fonts/josefinsans/josefinsans-thinitalic-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/josefinsans/josefinsans-thinitalic-webfont.woff') format('woff'),
url('fonts/josefinsans/josefinsans-thinitalic-webfont.ttf') format('truetype'),
url('fonts/josefinsans/josefinsans-thinitalic-webfont.svg#josefin_sansthin_italic') format('svg');
- font-weight: normal;
+ font-weight: 100;
+ font-style: italic;
+
+}
+
+
+
+/* Lato */
+
+@font-face {
+ font-family: 'Lato';
+ src: url('fonts/lato/Lato-Hai-webfont.eot');
+ src: url('fonts/lato/Lato-Hai-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/lato/Lato-Hai-webfont.woff') format('woff'),
+ url('fonts/lato/Lato-Hai-webfont.ttf') format('truetype'),
+ url('fonts/lato/Lato-Hai-webfont.svg#LatoHairline') format('svg');
+ font-weight: 100;
font-style: normal;
}
@font-face {
- font-family: 'LatoHairline';
- src: url('fonts/lato/Lato-Hai-webfont.eot');
- src: url('fonts/lato/Lato-Hai-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/lato/Lato-Hai-webfont.woff') format('woff'),
- url('fonts/lato/Lato-Hai-webfont.ttf') format('truetype'),
- url('fonts/lato/Lato-Hai-webfont.svg#LatoHairline') format('svg');
- font-weight: normal;
- font-style: normal;
-
-}
-
-@font-face {
- font-family: 'LatoHairlineItalic';
+ font-family: 'Lato';
src: url('fonts/lato/Lato-HaiIta-webfont.eot');
src: url('fonts/lato/Lato-HaiIta-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/lato/Lato-HaiIta-webfont.woff') format('woff'),
url('fonts/lato/Lato-HaiIta-webfont.ttf') format('truetype'),
url('fonts/lato/Lato-HaiIta-webfont.svg#LatoHairlineItalic') format('svg');
- font-weight: normal;
- font-style: normal;
+ font-weight: 100;
+ font-style: italic;
}
@font-face {
- font-family: 'LatoLight';
+ font-family: 'Lato';
src: url('fonts/lato/Lato-Lig-webfont.eot');
src: url('fonts/lato/Lato-Lig-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/lato/Lato-Lig-webfont.woff') format('woff'),
url('fonts/lato/Lato-Lig-webfont.ttf') format('truetype'),
url('fonts/lato/Lato-Lig-webfont.svg#LatoLight') format('svg');
- font-weight: normal;
+ font-weight: 300;
font-style: normal;
}
@font-face {
- font-family: 'LatoLightItalic';
+ font-family: 'Lato';
src: url('fonts/lato/Lato-LigIta-webfont.eot');
src: url('fonts/lato/Lato-LigIta-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/lato/Lato-LigIta-webfont.woff') format('woff'),
url('fonts/lato/Lato-LigIta-webfont.ttf') format('truetype'),
url('fonts/lato/Lato-LigIta-webfont.svg#LatoLightItalic') format('svg');
- font-weight: normal;
- font-style: normal;
+ font-weight: 300;
+ font-style: italic;
}
@font-face {
- font-family: 'LatoRegular';
+ font-family: 'Lato';
src: url('fonts/lato/Lato-Reg-webfont.eot');
src: url('fonts/lato/Lato-Reg-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/lato/Lato-Reg-webfont.woff') format('woff'),
@@ -207,61 +208,61 @@
}
@font-face {
- font-family: 'LatoItalic';
+ font-family: 'Lato';
src: url('fonts/lato/Lato-RegIta-webfont.eot');
src: url('fonts/lato/Lato-RegIta-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/lato/Lato-RegIta-webfont.woff') format('woff'),
url('fonts/lato/Lato-RegIta-webfont.ttf') format('truetype'),
url('fonts/lato/Lato-RegIta-webfont.svg#LatoItalic') format('svg');
font-weight: normal;
+ font-style: italic;
+
+}
+
+@font-face {
+ font-family: 'Lato';
+ src: url('fonts/lato/Lato-Bol-webfont.eot');
+ src: url('fonts/lato/Lato-Bol-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/lato/Lato-Bol-webfont.woff') format('woff'),
+ url('fonts/lato/Lato-Bol-webfont.ttf') format('truetype'),
+ url('fonts/lato/Lato-Bol-webfont.svg#LatoBold') format('svg');
+ font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'LatoBold';
- src: url('fonts/lato/Lato-Bol-webfont.eot');
- src: url('fonts/lato/Lato-Bol-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/lato/Lato-Bol-webfont.woff') format('woff'),
- url('fonts/lato/Lato-Bol-webfont.ttf') format('truetype'),
- url('fonts/lato/Lato-Bol-webfont.svg#LatoBold') format('svg');
- font-weight: normal;
- font-style: normal;
-
-}
-
-@font-face {
- font-family: 'LatoBoldItalic';
src: url('fonts/lato/Lato-BolIta-webfont.eot');
src: url('fonts/lato/Lato-BolIta-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/lato/Lato-BolIta-webfont.woff') format('woff'),
url('fonts/lato/Lato-BolIta-webfont.ttf') format('truetype'),
url('fonts/lato/Lato-BolIta-webfont.svg#LatoBoldItalic') format('svg');
- font-weight: normal;
+ font-weight: bold;
+ font-style: italic;
+
+}
+
+@font-face {
+ font-family: 'Lato';
+ src: url('fonts/lato/Lato-Bla-webfont.eot');
+ src: url('fonts/lato/Lato-Bla-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/lato/Lato-Bla-webfont.woff') format('woff'),
+ url('fonts/lato/Lato-Bla-webfont.ttf') format('truetype'),
+ url('fonts/lato/Lato-Bla-webfont.svg#LatoBlack') format('svg');
+ font-weight: 900;
font-style: normal;
}
@font-face {
- font-family: 'LatoBlack';
- src: url('fonts/lato/Lato-Bla-webfont.eot');
- src: url('fonts/lato/Lato-Bla-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/lato/Lato-Bla-webfont.woff') format('woff'),
- url('fonts/lato/Lato-Bla-webfont.ttf') format('truetype'),
- url('fonts/lato/Lato-Bla-webfont.svg#LatoBlack') format('svg');
- font-weight: normal;
- font-style: normal;
-
-}
-
-@font-face {
- font-family: 'LatoBlackItalic';
+ font-family: 'Lato';
src: url('fonts/lato/Lato-BlaIta-webfont.eot');
src: url('fonts/lato/Lato-BlaIta-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/lato/Lato-BlaIta-webfont.woff') format('woff'),
url('fonts/lato/Lato-BlaIta-webfont.ttf') format('truetype'),
url('fonts/lato/Lato-BlaIta-webfont.svg#LatoBlackItalic') format('svg');
- font-weight: normal;
- font-style: normal;
+ font-weight: 900;
+ font-style: italic;
}
\ No newline at end of file
--- a/integration/v2/css/style.css Tue Jun 18 11:48:49 2013 +0200
+++ b/integration/v2/css/style.css Tue Jun 18 13:29:25 2013 +0200
@@ -2,17 +2,20 @@
a{text-decoration: none; color: #000;}
.wrap{width: 950px; margin: 0 auto; }
.uppercase{text-transform: uppercase;}
+.fragment{width: 225px; height: 225px;}
+
header, footer{width:100%;background: url(../img/border-bottom-header.png) center bottom no-repeat;}
-footer{margin-bottom: 60px;background-position: top center; padding-top: 20px;font-size: 15px; font-family: 'LatoLight';}
+footer{margin-bottom: 60px;background-position: top center; padding-top: 20px;font-size: 15px; font-family: 'Lato'; font-weight: 300;}
footer h6{float: left;}
footer p{float: right;}
header .col-right{float: right; text-align: right;}
header .col-right form{display: inline-block; }
-h1{text-transform: uppercase; display:inline-block;padding: 64px 0 0 16px; font-family : 'josefin_sanssemibold'; font-size:34px;}
+h1{text-transform: uppercase; display:inline-block;padding: 64px 0 0 16px; font-family : 'josefin_sans'; font-weight : 600; font-size:34px;}
.head-login{padding-top: 10px; margin-bottom: 40px; display: inline-block;}
-.head-login, .head-login a{font-size: 12px; font-family: 'LatoRegular'; color: #626364;}
-.head-login input{width:140px;background: url(../img/icon-search.png) 150px center no-repeat;font-family: 'LatoBoldItalic'; font-size: 12px; border: 1px solid #D0D0D0; height: 25px; line-height: 25px; padding: 0 26px 0 4px;}
+.head-login, .head-login a{font-size: 12px; font-family: 'Lato'; color: #626364;}
+.head-login input{width:140px;background: url(../img/icon-search.png) 150px center no-repeat;font-family: 'Lato'; font-weight : bold; font-style : italic; font-size: 12px; border: 1px solid #D0D0D0; height: 25px; line-height: 25px; padding: 0 26px 0 4px;}
.hello-user{margin-left: 12px;}
+.head-login select{ vertical-align: middle;}
.head-login li{float: left; line-height: 27px;}
.dot-6{vertical-align:middle; width: 6px; height: 6px; -webkit-border-radius: 3px;-moz-border-radius: 3px;border-radius: 3px;background-color: #616364; display: inline-block; margin: 0 7px;}
.dot-10{ vertical-align:middle; width: 10px; height: 10px; -webkit-border-radius: 5px;-moz-border-radius: 5px;border-radius: 5px;background-color: #A1A1A1; display: inline-block; margin: 0 12px;}
@@ -20,18 +23,18 @@
nav li{height:100%; float:left; }
.nav{margin-bottom: 14px; height: 18px; display: block;}
.sub-nav{float: right; display: block;}
-.sub-nav a{font-size: 14px; font-family: 'LatoLight'; display:inline-block;}
+.sub-nav a{font-size: 14px; font-family: 'Lato'; font-weight: 300; display:inline-block;}
.sub-nav a:first-letter {text-transform: uppercase;}
-.sub-nav a.active, .sub-nav a:hover{font-family: 'LatoRegular';}
-.nav a{font-family: 'josefin_sansregular'; font-size: 18px; text-transform : uppercase;}
+.sub-nav a.active, .sub-nav a:hover{font-family: 'Lato';}
+.nav a{font-family: 'josefin_sans'; font-size: 18px; text-transform : uppercase;}
.title-page{margin: 30px 0; position: relative; min-height: 30px;}
-h2{text-transform: uppercase; display:inline-block; font-size: 30px; font-family: 'LatoLight'; }
-h2 span{text-transform: capitalize; font-size: 24px; font-family: 'LatoLightItalic';}
+h2{text-transform: uppercase; display:inline-block; font-size: 30px; font-family: 'Lato'; font-weight: 300; }
+h2 span{text-transform: capitalize; font-size: 24px; font-family: 'Lato'; font-weight: 300; font-style: italic;}
.title-menu{ position: absolute; bottom: 0; right: 0;}
.title-menu li{float: left;}
-.bar-tools{margin-bottom: 26px; line-height: 26px; font-family: 'LatoLight'; display:block;padding: 10px 0; background-image: url(../img/border-dot-bar.png), url(../img/border-dot-bar.png); background-position: top center, bottom center; background-repeat: no-repeat, no-repeat;}
+.bar-tools{margin-bottom: 26px; line-height: 26px; font-family: 'Lato'; font-weight: 300; display:block;padding: 10px 0; background-image: url(../img/border-dot-bar.png), url(../img/border-dot-bar.png); background-position: top center, bottom center; background-repeat: no-repeat, no-repeat;}
.bar-tools h3{ font-size: 18px; display: inline-block; text-transform: uppercase;}
.bar-tools ul{float: right;}
.bar-tools li{float: left; margin-left: 10px;}
@@ -40,7 +43,7 @@
.bar-tools a.save{padding-left: 30px;background-image: url(../img/icon-save-15.png); background-repeat: no-repeat; background-position: 9px center;}
/* Home */
.w650{width: 650px;}
-.our-images{margin-bottom: 38px; text-align: center; font-size: 12px; font-family: 'LatoBoldItalic'; color: #58595A;}
+.our-images{margin-bottom: 38px; text-align: center; font-size: 12px; font-family: 'Lato'; font-weight : bold; font-style : italic; color: #58595A;}
.home-images{position: relative; margin-bottom: 24px;}
a.home-arrow{ -webkit-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);-moz-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);background: url(../img/home-arrow.png) no-repeat center center #fff;cursor: pointer;display: block;height: 78px;left: 436px;position: absolute;top: -25px;width: 78px;z-index: 10;-webkit-border-radius: 39px;-moz-border-radius: 39px;border-radius: 39px;}
.home-images .col-left{float: left;}
@@ -49,29 +52,29 @@
.home-images .col-right img{display: block; width: 283px;}
.box-white, .box-black{position: absolute;-webkit-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);-moz-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);}
.box-white{width: 184px;padding: 0 20px;background: rgba(255, 255, 255, .8);}
-.box-3{left:400px; bottom: 30px; padding-top: 28px; padding-bottom: 28px;font-family: 'LatoItalic'; font-size: 19px; line-height: 20px;}
+.box-3{left:400px; bottom: 30px; padding-top: 28px; padding-bottom: 28px;font-family: 'Lato'; font-style: italic; font-size: 19px; line-height: 20px;}
.box-2{top: 140px; left: 124px; padding-top: 42px; padding-bottom: 66px;}
.box-2 span{display: block;}
-.box-2 .bold{font-size: 24px; font-family: 'LatoBold';}
+.box-2 .bold{font-size: 24px; font-family: 'Lato'; font-weight : bold;}
.box-2 .bold:first-child{margin-bottom: 14px;}
-.box-2 .number{font-size: 46px; font-family: 'josefin_sansregular'; margin-bottom: 6px;}
-.box-1{padding: 15px 50px 26px 15px; background-color: #000; color: #fff; font-size: 18px;font-family: 'josefin_sansbold_italic'; left: 80px; top: 94px; z-index: 11;}
+.box-2 .number{font-size: 46px; font-family: 'josefin_sans'; margin-bottom: 6px;}
+.box-1{padding: 15px 50px 26px 15px; background-color: #000; color: #fff; font-size: 18px;font-family: 'josefin_sans'; font-weight: bold; font-style: italic; left: 80px; top: 94px; z-index: 11;}
.list-projets li{float: left; width: 226px; background-color: #EEE; margin-right: 15px;}
.list-projets li:last-child{margin-right: 0;}
-.list-projets li h3{font-size: 18px; font-family: 'LatoBold'; line-height: 20px; padding: 14px 14px 0 14px; margin-bottom: 4px;}
-.list-projets li p{font-size: 18px; font-family: 'LatoLight'; line-height: 20px; padding: 0 14px; margin-bottom: 12px;}
-.list-projets li a{border-top: 1px solid #CCC; font-size: 12px; font-family: 'LatoLight'; display: block; height: 30px; line-height: 30px; padding-left: 20px;}
+.list-projets li h3{font-size: 18px; font-family: 'Lato'; font-weight : bold; line-height: 20px; padding: 14px 14px 0 14px; margin-bottom: 4px;}
+.list-projets li p{font-size: 18px; font-family: 'Lato'; font-weight: 300; line-height: 20px; padding: 0 14px; margin-bottom: 12px;}
+.list-projets li a{border-top: 1px solid #CCC; font-size: 12px; font-family: 'Lato'; font-weight: 300; display: block; height: 30px; line-height: 30px; padding-left: 20px;}
.list-projets li{margin-bottom: 58px;}
.list-projets-2{display: block; margin-bottom: 20px;background: url(../img/border-dot.png) repeat-x bottom left; padding-bottom: 1px;}
.list-projets-2>li{position:relative; background-color: #eee; width: 226px; float: left; margin-right: 15px; margin-bottom: 30px;}
.list-projets-2>li:nth-child(4n){margin-right: 0;}
.list-projets-2 .mid{ font-size: 18px; height: 66px; padding-left: 12px;}
-.list-projets-2 .mid h3{ font-family: 'LatoBold'; padding-top: 16px;}
-.list-projets-2 .mid p{ font-family: 'LatoLightItalic';}
+.list-projets-2 .mid h3{ font-family: 'Lato'; font-weight : bold; padding-top: 16px;}
+.list-projets-2 .mid p{ font-family: 'Lato'; font-weight: 300; font-style: italic;}
.list-projets-2 .bot img, .list-projets-2 .top img{ float: left;}
-.list-projets-2 .bot p{color: #333; background-color: #fff; font-family: 'LatoLightItalic'; padding: 8px 14px 0 14px; font-size: 14px; height: 104px; border-bottom: 1px solid #000; border-left: 1px solid #BBB; border-right: 1px solid #BBB;}
+.list-projets-2 .bot p{color: #333; background-color: #fff; font-family: 'Lato'; font-weight: 300; font-style: italic; padding: 8px 14px 0 14px; font-size: 14px; height: 104px; border-bottom: 1px solid #000; border-left: 1px solid #BBB; border-right: 1px solid #BBB;}
.list-projets-2 .bot{height: 113px; overflow: hidden;}
li .toggle{display: none;}
@@ -91,18 +94,18 @@
.list-projets-3 li.horizontal .col-left{ width: 225px;}
.list-projets-3 li.horizontal .col-right{height:100%; width: 240px; }
.list-projets-3 .project-title{position:relative; padding-left: 14px; font-size: 18px;height: 60px; border-bottom: 1px solid #CCC;}
-.project-title h3{ font-family: 'LatoBold'; padding-top: 12px; margin-bottom: 4px; }
-.project-title h4{ font-family: 'LatoLightItalic';}
+.project-title h3{ font-family: 'Lato'; font-weight : bold; padding-top: 12px; margin-bottom: 4px; }
+.project-title h4{ font-family: 'Lato'; font-weight: 300; font-style: italic;}
.project-title a.edit{ position: absolute; top: 10px; right: 10px;}
-.list-projets-3 .col-right p{max-height:200px; overflow: auto; padding: 10px 12px;font-size: 14px; font-family: 'LatoRegular'; line-height: 18px;}
+.list-projets-3 .col-right p{max-height:200px; overflow: auto; padding: 10px 12px;font-size: 14px; font-family: 'Lato'; line-height: 18px;}
.list-projets-3>li:hover{-webkit-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);-moz-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);}
.no-border-bot{background: none; margin-bottom: 0;}
.list-projets-4{margin-bottom: 44px;}
.list-projets-4>li:nth-child(4n){margin-right: 0;}
.list-projets-4>li{float: left; font-size: 18px; width: 225px; background-color: #ECEBEB; margin-right: 16px;}
-.list-projets-4 h3{ font-family: 'LatoBold'; padding: 18px 0 0 12px; margin-bottom: 8px;}
-.list-projets-4 p{ font-family: 'LatoLightItalic'; padding-left: 12px; line-height: 20px; padding-bottom: 10px;}
+.list-projets-4 h3{ font-family: 'Lato'; font-weight : bold; padding: 18px 0 0 12px; margin-bottom: 8px;}
+.list-projets-4 p{ font-family: 'Lato'; font-weight: 300; font-style: italic; padding-left: 12px; line-height: 20px; padding-bottom: 10px;}
.tools-2{ height: 25px; border-top: 1px solid #C5C5C5; padding: 6px 0; text-align: right;}
.tools-2 ul{display: inline-block;}
.tools-2 a{width: 25px; height: 25px; line-height: 25px; text-align: center;}
@@ -121,7 +124,17 @@
.box-shadow{ -webkit-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);-moz-box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);box-shadow: 1px 1px 5px rgba(50, 50, 50, 0.75);}
.popin-wrap{width: 100%; height: 100%; position: fixed; z-index: 100; background-color:rgba(255,255,255,.7);}
-.popin{width: 460px; background-color: #fff;}
-.popin h2{ font-size: 14px; font-family: 'LatoRegular'; padding: 14px 0 10px 12px;}
+.popin{width: 460px; background-color: #fff; top: 10%; position: absolute; left: 50%; margin-left: -230px;}
+.popin h2{ font-size: 14px; font-family: 'Lato'; padding: 14px 0 10px 12px;}
.popin header{background: none; border-bottom: 1px solid #DDD; position: relative;}
-.popin header a{ margin: 14px 12px 0 0; float:right;width: 10px; height: 10px; background: url(../img/close-popin.png) 0 0 no-repeat; display: inline-block;}
\ No newline at end of file
+.popin header a{ margin: 14px 12px 0 0; float:right;width: 10px; height: 10px; background: url(../img/close-popin.png) 0 0 no-repeat; display: inline-block;}
+.popin label{margin-bottom: 6px; margin-right: 6px; font-size: 12px; font-family: 'Lato'; font-weight: 300;}
+.popin form{padding: 8px 12px 20px 12px;}
+.popin input[type=text], .popin textarea{border: 1px solid #CCC;font-family: 'Lato'; font-size: 12px;}
+.popin input[type=text]{height: 25px; width: 294px; padding: 0 10px; }
+.popin textarea{width: 433px; max-width: 433px;}
+.popin p{margin-bottom: 10px;}
+.popin .buttons{text-align: right;}
+.btn{cursor:pointer; border: none; vertical-align:middle; display: inline-block; color: #FFF; font-size: 12px; font-family: 'Lato'; height: 25px; line-height: 25px; padding: 0 12px; background-color: #666;}
+.block{display: block;}
+.popin-wrap, .popin{display: none;}
--- a/integration/v2/gabarit.html Tue Jun 18 11:48:49 2013 +0200
+++ b/integration/v2/gabarit.html Tue Jun 18 13:29:25 2013 +0200
@@ -18,7 +18,7 @@
<div class="wrap">
<header class="clearfix">
- <h1><a href="#">EGONOMY</a></h1>
+ <h1><a href="#">egonomy</a></h1>
<div class="col-right">
<ul class="head-login clearfix">
<li>
@@ -44,11 +44,11 @@
</ul>
<ul class="sub-nav clearfix">
<li><span class="dot-6"></span></li>
- <li><a href="#" class="active">Mes collections</a></li>
+ <li><a href="#" class="active">mes collections</a></li>
<li><span class="dot-6"></span></li>
- <li><a href="#">Mes collages</a></li>
+ <li><a href="#">mes collages</a></li>
<li><span class="dot-6"></span></li>
- <li><a href="#">Mon profil</a></li>
+ <li><a href="#">mon profil</a></li>
</ul>
</nav>
</div>
--- a/integration/v2/js/main.js Tue Jun 18 11:48:49 2013 +0200
+++ b/integration/v2/js/main.js Tue Jun 18 13:29:25 2013 +0200
@@ -1,13 +1,30 @@
$(function(){
+//masonry
var container = $('.list-projets-3');
container.masonry({
columnWidth: 465,
itemSelector: '.item',
gutter : 20
});
-
+//popin
$('.new-collection').bind('click', function(e){
e.preventDefault();
+ var target = $(this).attr('href');
+ $('.popin-wrap').fadeIn(function(){
+ $(target).show();
+ });
+ });
+
+ $('.close-popin, .popin-wrap').bind('click', function(e){
+ e.preventDefault();
+ e.stopPropagation();
+ $('.popin-wrap').fadeOut(function(){
+ $('.popin').hide();
+ });
+ });
+
+ $('.popin').bind('click', function(e){
+ e.stopPropagation();
});
});//ready