Merge branch 'master' of git://github.com/friendica/friendica

2 files changed, 117 insertions, 6 deletions

diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css
index e85c58850..df25c4d17 100644
--- a/view/theme/diabook/diabook-pink/style-wide.css
+++ b/view/theme/diabook/diabook-pink/style-wide.css
@@ -2799,6 +2799,36 @@ float: left;
 /* = Directory = */
 /* ============= */
 /* contacts menu */
+
+section .directory-item dl {
+height: auto;
+overflow: auto;
+}
+
+section .directory-item dt {
+float: left;
+margin-left: 0px;
+text-align: right;
+color: #999;
+}
+
+section .directory-item dd {
+float: left;
+margin-left: 5px;
+}
+
+.directory-profile-wrapper {
+float: left;
+max-height: 178px;
+overflow: hidden;
+width: 635px;
+}
+
+.directory-copy-wrapper {
+float:left;
+overflow: hidden;
+}
+
 .contact-photo-wrapper {
   position: relative;
 }
@@ -2839,7 +2869,7 @@ float: left;
 }
 .directory-item {
   float: left;
-  width: 200px;
+  width: 800px;
   height: 200px;
 }
 .directory-item .contact-photo {
@@ -2850,14 +2880,46 @@ float: left;
   width: 175px;
   height: 175px;
 }
+
+section .directory-photo-wrapper {
+float: left;
+height: 200px;
+width: 165px;
+}
+
 .contact-name {
   text-align: left;
   font-weight: bold;
-  font-size: 12px;
+  font-size: 18px;
+  margin-bottom: -3px;
 }
 .contact-details {
   color: #999999;
 }
+
+.page-type {
+font-size: 10px;
+font-style: italic;
+}
+
+.directory-detailscolumn-wrapper {
+float: left;
+width: 305px;
+margin-right: 10px;
+}
+
+.directory-profile-wrapper d1 {
+margin-top: 3px;
+margin-bottom: 3px;
+}
+
+.directory-profile-title {
+font-weight: bold;
+margin-bottom: 3px
+font-size: 14px;
+}
+
+
 #side-bar-photos-albums{
 	margin-top: 15px;	
 	}
diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css
index 248e3ead0..e9bcd53d0 100644
--- a/view/theme/diabook/diabook-pink/style.css
+++ b/view/theme/diabook/diabook-pink/style.css
@@ -2795,6 +2795,30 @@ float: left;
 /* ============= */
 /* = Directory = */
 /* ============= */
+section .directory-item dl {
+  height: auto;
+  overflow: auto;	
+}
+section .directory-item dt {
+  float: left;
+  margin-left: 0px;
+  text-align: right;
+  color: #999;
+}
+section .directory-item dd {
+  float: left;
+  margin-left: 5px;
+}
+.directory-profile-wrapper {
+  float: left;
+  max-height: 178px;
+  overflow: hidden;
+  width: 635px;
+}
+.directory-copy-wrapper {
+  float: left;
+  overflow: hidden;	
+}
 /* contacts menu */
 .contact-photo-wrapper {
   position: relative;
@@ -2836,7 +2860,7 @@ float: left;
 }
 .directory-item {
   float: left;
-  width: 200px;
+  width: 800px;
   height: 200px;
 }
 .directory-item .contact-photo {
@@ -2847,17 +2871,42 @@ float: left;
   width: 175px;
   height: 175px;
 }
+
+section .directory-photo-wrapper {
+  float: left;
+  height: 200px;
+  width: 165px;  
+}
 .contact-name {
-  text-align: left;
   font-weight: bold;
-  font-size: 12px;
+  font-size: 18px;
+  margin-bottom: -3px;
+  text-align: left;
 }
 .contact-details {
   color: #999999;
 }
+.page-type {
+  font-size: 10px;
+  font-style: italic;
+}
+.directory-detailscolumn-wrapper {
+  float: left;	
+  width: 305px;
+  margin-right: 10px;  
+}
+.directory-profile-wrapper dl {
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+.directory-profile-title {
+  font-weight: bold;
+  margin-bottom: 3px;
+  font-size: 14px;
+}
 #side-bar-photos-albums{
 	margin-top: 15px;	
-	}
+}
 .photo-top-photo, .photo-album-photo {
   -webkit-border-radius: 5px 5px 0 0;
   -moz-border-radius: 5px 5px 0 0;