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 b75d526629ab790534c76725a163558a08832480
authorveltr
Tue, 27 Nov 2012 11:23:36 +0100
changeset 55 25313bf54ef7
parent 54 aa0391d09b6f (current diff)
parent 51 b75d526629ab (diff)
child 56 acd44120963c
Merge with b75d526629ab790534c76725a163558a08832480
integration/css/home.css file | annotate | diff | comparison | revisions
integration/hashcut.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:23:07 2012 +0100
+++ b/integration/css/common.css	Tue Nov 27 11:23:36 2012 +0100
@@ -182,6 +182,7 @@
 .header .profil-wrap a:hover{
 	color: #FF00FC;
 }
+/*
 .header .profil-wrap a.all-hashcut{
 	top: 12px;
 	background: url(../img/arrow-top.png) right 2px no-repeat;
@@ -190,6 +191,19 @@
 	top: 32px;
 	background: url(../img/arrow-bot.png) right 4px no-repeat;
 }
+*/
+.header .profil-wrap a.all-hashcut{
+	top: 8px;
+	background: url(../img/arrow-top.png) right 2px no-repeat;
+}
+.header .profil-wrap a.my-profil{
+	top: 40px;
+	background: url(../img/arrow-bot.png) right 4px no-repeat;
+}
+.header .profil-wrap a.new-hashcut{
+	top: 24px;
+	background: url(../img/pencil-icon.png) right 1px no-repeat;
+}
 /* content */
 .content{
 	width: 960px;
--- a/integration/css/home.css	Tue Nov 27 11:23:07 2012 +0100
+++ b/integration/css/home.css	Tue Nov 27 11:23:36 2012 +0100
@@ -9,6 +9,8 @@
 	font-size: 24px;
 	text-decoration: underline;
 	font-weight: bold;
+	background: url(../img/pencil-icon.png) right 12px no-repeat;
+	padding-right: 22px;
 }
 .title-header h2 a:hover{
 	text-decoration: none;
--- a/integration/hashcut.html	Tue Nov 27 11:23:07 2012 +0100
+++ b/integration/hashcut.html	Tue Nov 27 11:23:36 2012 +0100
@@ -113,6 +113,7 @@
                 </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>
                 </div>
             </div><!-- header -->
--- a/integration/media.html	Tue Nov 27 11:23:07 2012 +0100
+++ b/integration/media.html	Tue Nov 27 11:23:36 2012 +0100
@@ -113,6 +113,7 @@
                 </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>
                 </div>
             </div><!-- header -->
--- a/integration/profil.html	Tue Nov 27 11:23:07 2012 +0100
+++ b/integration/profil.html	Tue Nov 27 11:23:36 2012 +0100
@@ -99,6 +99,7 @@
                 <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>
                 </div>
             </div><!-- header -->
hashcut