Merge remote branch 'upstream/master'

[friendica.git] / view / theme / diabook / style.css

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 5841a96b36f1bd1006e0b65e66d529d3f46b651a..d964243a93ad600c3edb4020e19247b6502cfbe8 100644 (file)
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -102,7 +102,6 @@
 .icon.recycle  { background-image: url("../../../view/theme/diabook/icons/recycle.png");}
 .icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");}
 .icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.png");}  
-.icon.file-as { background-image: url("../../../view/theme/diabook/icons/file_as.png");}
 .star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
 .star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");}
 .icon.link             { background-image: url("../../../view/theme/diabook/icons/link.png");}
@@ -395,7 +394,7 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
+  font-size: 12.5px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
@@ -877,6 +876,8 @@ ul.menu-popup .empty {
   padding-top: 4px;
   padding-left: 5px;   
   color: #2D2D2D;
+  word-wrap: break-word;
+  width: 130px;
        }
 #ps-username:hover{
   text-decoration: none;       
@@ -923,6 +924,9 @@ ul.menu-popup .empty {
 .menu-profile-list.com_side{
        background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
        }
+.menu-profile-list.pscontacts{
+       background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
+       }
 
 /* aside */
 aside {
@@ -1213,10 +1217,10 @@ body .pageheader{
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 13px;
+  font-size: 12.5px;
   max-width: 720px;
   word-wrap: break-word;
-  line-height: 1.4;
+  line-height: 1.2;
 }
 
 .wall-item-container .wall-item-content img {