From: Olga Brani <olgabrani@grnet.gr>
Date: Thu, 2 Aug 2012 13:34:29 +0000 (+0300)
Subject: Merge branch 'newstyles' of https://code.grnet.gr/git/astakos into newstyles
X-Git-Tag: astakos/v0.7.2^2~1^2
X-Git-Url: https://code.grnet.gr/git/astakos/commitdiff_plain/6f0777d9d3cb2b4d6a97d467f66d492dc196b474

Merge branch 'newstyles' of https://code.grnet.gr/git/astakos into newstyles

Conflicts:
	snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
---

6f0777d9d3cb2b4d6a97d467f66d492dc196b474
diff --cc snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
index e6181d4,409009f..7c9aa6c
--- a/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
+++ b/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
@@@ -6,11 -6,16 +6,16 @@@
  
  
  /* cloudbar header */
 -div.cloudbar                                    { background:#000; color:#fff;	   line-height:35px;  width:100%;   font-size:13px; font-family:Antic,Arial,sans-serif;}	
 +div.cloudbar                                    { background:#000; color:#fff;	   line-height:35px;  width:100%;   font-size:13px; font-family: 'Didact Gothic', Verdana, sans-serif;}	
+ 
+ div.cloudbar a, 
+ div.cloudbar .profile span,
 -div.cloudbar li {font-family:Antic,Arial,sans-serif !important; letter-spacing: 1px !important}
++div.cloudbar li {font-family:'Didact Gothic',Verdana,sans-serif !important; letter-spacing: 1px !important}
+ 
  .cloudbar .wrapper                              { width:auto; padding:0;}			
  .cloudbar a                                     { color:#fff; text-decoration:none;}
 -.cloudbar .profile                              { float:right; background:#01A1AE; min-width:190px; padding:0; text-align:right;  }
 -.cloudbar .profile:hover						{ background:#41b9c2; }
 +.cloudbar .profile                              { float:right; background:#3582AC; min-width:190px; padding:0; text-align:right;  }
 +.cloudbar .profile:hover						{ background:#5A97B8; }
  .cloudbar .profile a                            { text-decoration:none; color:#fff; display:block; width:100%;}
  .cloudbar .profile ul                           { position:absolute;   right:0; top:35px; padding:0; margin:0;  width:190px; display:none;	z-index:9; background:#fff;}
  .cloudbar .profile ul li                        { list-style:none outside; line-height:35px; padding:0 20px;}