Mercurial Mercurial > hashcut / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 9d80aeae789bf12e7949c6187349a64bc7cc4571
authorveltr
Tue, 27 Nov 2012 13:38:31 +0100
changeset 57 cf436d07a3cb
parent 56 acd44120963c (current diff)
parent 53 9d80aeae789b (diff)
child 58 293d6aee8964
Merge with 9d80aeae789bf12e7949c6187349a64bc7cc4571
integration/edition.html file | annotate | diff | comparison | revisions
integration/hashcut.html file | annotate | diff | comparison | revisions
integration/home.html file | annotate | diff | comparison | revisions
integration/media.html file | annotate | diff | comparison | revisions
integration/profil.html file | annotate | diff | comparison | revisions 
--- a/integration/css/common.css	Tue Nov 27 11:48:28 2012 +0100
+++ b/integration/css/common.css	Tue Nov 27 13:38:31 2012 +0100
@@ -171,24 +171,33 @@
 }
 .header .profil-wrap a{
 	width: 160px;
-	display: block;
+	display: inline-block;
 	text-align: right;
-	position: absolute;
 	right: 0;
 	font-size: 13px;
 	color: #30036d;
 	padding-right: 18px;
 }
+.profil-wrap li{
+	text-align: right;
+	line-height: 18px;
+}
 .header .profil-wrap a:hover{
 	color: #FF00FC;
 }
 .header .profil-wrap a.all-hashcut{
 	top: 2px;
-	background: url(../img/arrow-top.png) right 2px no-repeat;
+	background: url(../img/arrow-top.png) right 3px no-repeat;
 }
 .header .profil-wrap a.my-profil{
 	top: 42px;
-	background: url(../img/arrow-bot.png) right 4px no-repeat;
+	background: url(../img/arrow-bot.png) right 6px no-repeat;
+}
+.space-top{
+	padding-top: 10px;
+}
+.space-top-2{
+	padding-top: 30px;
 }
 .header .profil-wrap a.new-hashcut{
 	top: 22px;
--- a/integration/edition.html	Tue Nov 27 11:48:28 2012 +0100
+++ b/integration/edition.html	Tue Nov 27 13:38:31 2012 +0100
@@ -123,8 +123,10 @@
                     <p class="time-length">Durée: <span class="mashup-total-duration">00:00</span></p>
                 </div>
                 <div class="profil-wrap">
-                    <a href="#" class="all-hashcut">Tous les Hashcuts</a>
-                    <a href="#user" class="my-profil open-popin">Mon profil</a>
+                    <ul class="space-top">
+                        <li><a href="#" class="all-hashcut">Tous les Hashcuts</a></li>
+                        <li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
+                    </ul>
                 </div>
             </div><!-- header -->
         </div> <!-- wrap-header -->
--- a/integration/hashcut.html	Tue Nov 27 11:48:28 2012 +0100
+++ b/integration/hashcut.html	Tue Nov 27 13:38:31 2012 +0100
@@ -112,9 +112,11 @@
                     <p class="title-video" href="#">Hashcut sans titre</p>
                 </div>
                 <div class="profil-wrap">
-                    <a href="#" class="all-hashcut">Tous les Hashcuts</a>
-                    <a href="edition.html" class="new-hashcut">Créer un Hashcut</a>
-                    <a href="#user" class="my-profil open-popin">Mon profil</a>
+                    <ul>
+                        <li><a href="#" class="all-hashcut">Tous les Hashcuts</a></li>
+                        <li><a href="edition.html" class="new-hashcut">Créer un Hashcut</a></li>
+                        <li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
+                    </ul>
                 </div>
             </div><!-- header -->
         </div><!-- wrap-header -->    
--- a/integration/home.html	Tue Nov 27 11:48:28 2012 +0100
+++ b/integration/home.html	Tue Nov 27 13:38:31 2012 +0100
@@ -100,8 +100,9 @@
                     <h2><a href="#">Créer un hashcut !</a></h2>
                 </div>
                 <div class="profil-wrap">
-                   
-                    <a href="#user" class="my-profil open-popin">Mon profil</a>
+                    <ul class="space-top-2">
+                        <li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
+                    </ul>
                 </div>
             </div><!-- header -->
         </div><!-- wrap-header -->
--- a/integration/media.html	Tue Nov 27 11:48:28 2012 +0100
+++ b/integration/media.html	Tue Nov 27 13:38:31 2012 +0100
@@ -111,9 +111,11 @@
                     <p class="title-video" href="#">Titre du Média</p>
                 </div>
                 <div class="profil-wrap">
-                    <a href="#" class="all-hashcut">Tous les Hashcuts</a>
-                    <a href="edition.html" class="new-hashcut">Créer un Hashcut</a>
-                    <a href="#user" class="my-profil open-popin">Mon profil</a>
+                    <ul>
+                        <li><a href="#" class="all-hashcut">Tous les Hashcuts</a></li>
+                        <li><a href="edition.html" class="new-hashcut">Créer un Hashcut</a></li>
+                        <li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
+                    </ul>
                 </div>
             </div><!-- header -->
         </div><!-- wrap-header -->    
--- a/integration/profil.html	Tue Nov 27 11:48:28 2012 +0100
+++ b/integration/profil.html	Tue Nov 27 13:38:31 2012 +0100
@@ -98,9 +98,11 @@
                 </a></h1>
                 <div class="title-header"></div>
                 <div class="profil-wrap">
-                    <a href="#" class="all-hashcut">Tous les Hashcuts</a>
-                    <a href="edition.html" class="new-hashcut">Créer un Hashcut</a>
-                    <a href="#user" class="my-profil open-popin">Mon profil</a>
+                    <ul>
+                        <li><a href="#" class="all-hashcut">Tous les Hashcuts</a></li>
+                        <li><a href="edition.html" class="new-hashcut">Créer un Hashcut</a></li>
+                        <li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
+                    </ul>
                 </div>
             </div><!-- header -->
         </div><!-- wrap-header -->
hashcut