aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-07-03 21:41:05 -0700
committerfriendica <info@friendica.com>2012-07-03 21:41:05 -0700
commit13b4962531ca3c4f085b385a2c6b8f088abb7d6a (patch)
tree6e6c787f6e3ef2242e77ca8984c192c1933ef6d8
parentc726a92a3fee9e6dec3ad5af8c4e412491f109b8 (diff)
parentbadaa68340876887c3383d493804909301a90c63 (diff)
downloadvolse-hubzilla-13b4962531ca3c4f085b385a2c6b8f088abb7d6a.tar.gz
volse-hubzilla-13b4962531ca3c4f085b385a2c6b8f088abb7d6a.tar.bz2
volse-hubzilla-13b4962531ca3c4f085b385a2c6b8f088abb7d6a.zip
Merge https://github.com/friendica/friendica into pull
-rw-r--r--view/theme/diabook/diabook-aerith/style-wide.css38
-rw-r--r--view/theme/diabook/diabook-blue/style-wide.css66
-rw-r--r--view/theme/diabook/diabook-green/style-wide.css38
-rw-r--r--view/theme/diabook/diabook-pink/style-wide.css66
-rw-r--r--view/theme/diabook/diabook-red/style-wide.css38
5 files changed, 239 insertions, 7 deletions
diff --git a/view/theme/diabook/diabook-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css
index 43c0974b1..98c645024 100644
--- a/view/theme/diabook/diabook-aerith/style-wide.css
+++ b/view/theme/diabook/diabook-aerith/style-wide.css
@@ -2822,6 +2822,35 @@ 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;
}
@@ -2862,13 +2891,20 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+float: left;
+height: 200px;
+width: 165px;
+}
+
.directory-item .contact-photo img {
width: 175px;
height: 175px;
diff --git a/view/theme/diabook/diabook-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css
index 103047f32..fe1e8f662 100644
--- a/view/theme/diabook/diabook-blue/style-wide.css
+++ b/view/theme/diabook/diabook-blue/style-wide.css
@@ -2778,6 +2778,35 @@ 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;
}
@@ -2818,7 +2847,7 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
@@ -2829,14 +2858,47 @@ 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-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css
index 0a9c5e35c..107bec8bb 100644
--- a/view/theme/diabook/diabook-green/style-wide.css
+++ b/view/theme/diabook/diabook-green/style-wide.css
@@ -2799,6 +2799,35 @@ 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,13 +2868,20 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+float: left;
+height: 200px;
+width: 165px;
+}
+
.directory-item .contact-photo img {
width: 175px;
height: 175px;
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-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css
index b068a2f5d..b05156dc6 100644
--- a/view/theme/diabook/diabook-red/style-wide.css
+++ b/view/theme/diabook/diabook-red/style-wide.css
@@ -2805,6 +2805,35 @@ 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;
}
@@ -2845,13 +2874,20 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+float: left;
+height: 200px;
+width: 165px;
+}
+
.directory-item .contact-photo img {
width: 175px;
height: 175px;