# HG changeset patch
# User veltr
# Date 1354013308 -3600
# Node ID acd44120963c90a444c8b8ac5790f9765c34fcf1
# Parent 25313bf54ef7fe1ea468e5edf1a8aaa20fa82021# Parent 2565a518aafafd29f5e299c78afd58443f20ba94
Merge with 2565a518aafafd29f5e299c78afd58443f20ba94
diff -r 25313bf54ef7 -r acd44120963c integration/css/common.css
--- a/integration/css/common.css Tue Nov 27 11:23:36 2012 +0100
+++ b/integration/css/common.css Tue Nov 27 11:48:28 2012 +0100
@@ -175,34 +175,24 @@
text-align: right;
position: absolute;
right: 0;
- font-size: 14px;
+ font-size: 13px;
color: #30036d;
padding-right: 18px;
}
.header .profil-wrap a:hover{
color: #FF00FC;
}
-/*
.header .profil-wrap a.all-hashcut{
- top: 12px;
+ top: 2px;
background: url(../img/arrow-top.png) right 2px no-repeat;
}
.header .profil-wrap a.my-profil{
- 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;
+ top: 42px;
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;
+ top: 22px;
+ background: url(../img/pencil-icon.png) right 0px no-repeat;
}
/* content */
.content{
diff -r 25313bf54ef7 -r acd44120963c integration/media.html
--- a/integration/media.html Tue Nov 27 11:23:36 2012 +0100
+++ b/integration/media.html Tue Nov 27 11:48:28 2012 +0100
@@ -13,7 +13,6 @@
-
