--- a/integration/v2/01-home.html Tue Jun 18 17:38:17 2013 +0200
+++ b/integration/v2/01-home.html Wed Jun 19 15:14:32 2013 +0200
@@ -7,11 +7,12 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="description" content="eGonomy">
- <title>eGonomy</title>
+ <title>eGonomy : Home</title>
<link rel="stylesheet" href="css/reset.css">
<link rel="stylesheet" href="css/fonts.css">
<link rel="stylesheet" href="css/style.css">
+ <link rel="stylesheet" href="css/slideshow.css">
<script src="js/vendor/modernizr-2.6.2.min.js"></script>
</head>
<body>
@@ -63,7 +64,11 @@
</div>
<p class="our-images">Découvrez les images</p>
<div id="home-images" class="home-images clearfix">
- <a href="#home-images" class="home-arrow"></a>
+
+ <div class="arrow-wrap home-arrow">
+ <a class="arrow" href="#home-images"></a>
+ </div>
+
<div class="col-left">
<div class="box-black box-1 uppercase">
explorez
--- a/integration/v2/02-collectionner.html Tue Jun 18 17:38:17 2013 +0200
+++ b/integration/v2/02-collectionner.html Wed Jun 19 15:14:32 2013 +0200
@@ -7,7 +7,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="description" content="eGonomy">
- <title>eGonomy</title>
+ <title>eGonomy : Collectionner</title>
<link rel="stylesheet" href="css/reset.css">
<link rel="stylesheet" href="css/fonts.css">
--- a/integration/v2/03-collection_non_connecte.html Tue Jun 18 17:38:17 2013 +0200
+++ b/integration/v2/03-collection_non_connecte.html Wed Jun 19 15:14:32 2013 +0200
@@ -7,7 +7,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="description" content="eGonomy">
- <title>eGonomy</title>
+ <title>eGonomy : Collectionner (non connecté)</title>
<link rel="stylesheet" href="css/reset.css">
<link rel="stylesheet" href="css/fonts.css">
--- a/integration/v2/05-home_connecte.html Tue Jun 18 17:38:17 2013 +0200
+++ b/integration/v2/05-home_connecte.html Wed Jun 19 15:14:32 2013 +0200
@@ -7,7 +7,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="description" content="eGonomy">
- <title>eGonomy</title>
+ <title>eGonomy : Home (connecté)</title>
<link rel="stylesheet" href="css/reset.css">
<link rel="stylesheet" href="css/fonts.css">
@@ -72,6 +72,16 @@
</ul>
</div>
+ <ul class="pagination clearfix">
+ <li><a href="#"><</a></li>
+ <li><a href="#">1</a></li>
+ <li class="curent">58</li>
+ <li>...</li>
+ <li><a href="#">737</a></li>
+ <li><a href="#">2489</a></li>
+ <li><a href="#">></a></li>
+ </ul>
+
<ul class="list-projets-2 clearfix no-border-bot">
<li>
<div class="tools toggle">
--- a/integration/v2/06-07-mes_collections-popin_nouvelle_collection.html Tue Jun 18 17:38:17 2013 +0200
+++ b/integration/v2/06-07-mes_collections-popin_nouvelle_collection.html Wed Jun 19 15:14:32 2013 +0200
@@ -7,7 +7,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="description" content="eGonomy">
- <title>eGonomy</title>
+ <title>eGonomy : Mes collections</title>
<link rel="stylesheet" href="css/reset.css">
<link rel="stylesheet" href="css/fonts.css">
--- a/integration/v2/13-detail_image.html Tue Jun 18 17:38:17 2013 +0200
+++ b/integration/v2/13-detail_image.html Wed Jun 19 15:14:32 2013 +0200
@@ -7,11 +7,12 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="description" content="eGonomy">
- <title>eGonomy</title>
+ <title>eGonomy : Détail image</title>
<link rel="stylesheet" href="css/reset.css">
<link rel="stylesheet" href="css/fonts.css">
<link rel="stylesheet" href="css/style.css">
+ <link rel="stylesheet" href="css/slideshow.css">
<script src="js/vendor/modernizr-2.6.2.min.js"></script>
</head>
<body>
@@ -58,11 +59,9 @@
</div>
<div class="bar-tools clearfix">
<ul class="clearfix left">
- <li><a class="icon cut" href="#">Créer un fragment</a></li>
-
- <li><a class="icon plus" href="#">Ajouter à ma collection</a></li>
+ <li><a class="go-to mosaic" href="#"></a></li>
+ <li><a class="go-to search" href="#"></a></li>
</ul>
-
<ul class="clearfix">
<li>
<a class="icon cut" href="#">Créer un fragment</a>
@@ -79,7 +78,47 @@
</li>
</ul>
</div>
-
+ <article class="edition">
+ <div class="slideshow box-edition">
+ <div class="image-wrap">
+ <img src="img/378x600.png" alt="">
+ </div>
+ <div class="arrow-wrap left-arrow">
+ <a class="arrow" href="#"></a>
+ </div>
+ <div class="arrow-wrap right-arrow">
+ <a class="arrow" href="#"></a>
+ </div>
+ <ul class="share">
+ <li><a title="Partager sur Twitter" href="#" class="tool twitter"></a></li>
+ <li><a title="Partager sur Facebook" href="#" class="tool facebook"></a></li>
+ </ul>
+ </div>
+ <div class="info box-edition">
+ <table>
+ <tbody>
+ <tr>
+ <th>Auteur :</th>
+ <td>Delacroix Eugène (1798-1863)</td>
+ </tr>
+ <tr>
+ <th>Période :</th>
+ <td>Période contemporaine de 1789 à 1914,19e siècle,</td>
+ </tr>
+ <tr>
+ <th>Description :</th>
+ <td>Lorem ipsum dolor sit amet, consectetur adipisicing elit. In sapiente consectetur amet ipsam rem quae culpa voluptatem excepturi aperiam pariatur eaque explicabo. Voluptates natus nulla repellat dolorem animi ut voluptate.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class=" box-edition">
+ <h3>Mots clés :</h3>
+ <ul class="list-key-search">
+ <li><a href="#"></a></li>
+ </ul>
+ </div>
+ </article>
</section>
<footer class="clearfix">
--- a/integration/v2/css/style.css Tue Jun 18 17:38:17 2013 +0200
+++ b/integration/v2/css/style.css Wed Jun 19 15:14:32 2013 +0200
@@ -13,7 +13,7 @@
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: 'Lato'; color: #626364;}
-.head-login input, .search-form{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;}
+.head-login input, .search-form{ vertical-align: middle; 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;}
@@ -21,8 +21,8 @@
.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;}
nav{height: 70px;}
nav li{height:100%; float:left; }
-.nav{margin-bottom: 14px; height: 18px; display: block;}
-.sub-nav{float: right; display: block;}
+.nav{margin-bottom: 14px; height: 18px; display: block;float: right;}
+.sub-nav{float: right; display: block;clear: both; }
.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: 'Lato'; font-weight: bold;}
@@ -34,12 +34,17 @@
.title-menu{ position: absolute; bottom: 0; right: 0;}
.title-menu li{float: left;}
-.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{margin-bottom: 12px; line-height: 35px; padding-bottom: 1px; font-family: 'Lato'; font-weight: 300; display:block;background-image: url(../img/border-bar-tools.png), url(../img/border-bar-tools.png); background-position: top center, bottom center; background-repeat: repeat-x;}
.bar-tools h3{ font-size: 18px; display: inline-block; text-transform: uppercase;}
.bar-tools ul{float: right;}
.bar-tools ul.left{float: left;}
+.bar-tools ul.left li{margin-left: 0; margin-right: 10px;}
+.bar-tools ul.left a{width: 40px; padding: 0; vertical-align: middle;}
+.go-to{background-repeat: no-repeat;background-position: 4px center, 20px center;}
+.go-to.mosaic{background-image: url(../img/icon-mosaic.png), url(../img/icon-arrow-enter.png);}
+.go-to.search{background-image: url(../img/icon-search.png), url(../img/icon-arrow-enter.png);}
.bar-tools li{float: left; margin-left: 10px;}
-.bar-tools li a{display: inline-block; font-size: 12px; height: 24px; line-height: 24px; padding: 0 7px; background-color: #DDD;}
+.bar-tools li a{display: inline-block; font-size: 12px; height: 25px; line-height: 25px; padding: 0 7px; background-color: #DDD;}
.bar-tools li a:hover{background-color: #eee;}
.bar-tools li a:first-letter {text-transform: uppercase;}
.bar-tools a.icon{padding-left: 30px;background-repeat: no-repeat; background-position: 8px center;}
@@ -51,7 +56,7 @@
.w650{width: 650px;}
.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;}
+.arrow-wrap.home-arrow{display: block; top:0; margin-top: -26px; left: 50%; margin-left: -39px;}
.home-images .col-left{float: left;}
.home-images .col-left img{width: 667px;}
.home-images .col-right{float: right;}
@@ -118,6 +123,9 @@
.tools-2 a img{vertical-align: middle;}
.tools-2 li{ float: left; margin-right: 6px;}
+.pagination{ margin-bottom: 12px;}
+.pagination li{float: left; font-size: 14px;font-family: 'Lato'; margin-right: 14px;}
+.pagination li.curent, .pagination li:hover{font-weight: bold;}
.tool{display:inline-block; width:25px; height: 25px; background-image: url(../img/tools-sprite.png); background-repeat: no-repeat; vertical-align: middle;}
.tool.twitter:hover{background-position: 0 0;}
.tool.twitter{background-position: 0 -25px;}
@@ -149,4 +157,18 @@
.block{display: block;}
.popin-wrap, .popin{display: none;}
-
+.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;}
+.slideshow .left-arrow{left: 0;}
+.slideshow .right-arrow{right: 0;}
+.slideshow .share{position: absolute; bottom: 24px; right: 0;}
+.slideshow .share li{float: left; margin-left: 8px;}
+.image-wrap{display: inline-block;}
+.info{font-family: 'Lato'; font-size: 14px; text-align: left;}
+.info th{color: #777; min-width: 140px; }
+.info td{color: #000; line-height: 16px;}
+.info table{border-collapse:separate;border-spacing:0 5px;}
+.box-edition{padding: 16px 0; border-bottom: 1px solid #CCC;}
+.box-edition h3{color: #777;font-family: 'Lato'; font-size: 14px; margin-bottom: 6px;}
+.list-key-search a{display: inline-block;}
\ No newline at end of file
--- a/integration/v2/gabarit.html Tue Jun 18 17:38:17 2013 +0200
+++ b/integration/v2/gabarit.html Wed Jun 19 15:14:32 2013 +0200
@@ -37,11 +37,9 @@
<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>
@@ -64,6 +62,7 @@
<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>
Binary file integration/v2/img/378x600.png has changed
Binary file integration/v2/img/border-bar-tools.png has changed
Binary file integration/v2/img/icon-arrow-enter.png has changed
