1
0
Fork 0

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

This commit is contained in:
Tobias Diekershoff 2011-05-26 08:20:27 +02:00
commit 5e01432c6f
12 changed files with 2174 additions and 2074 deletions

View file

@ -336,6 +336,9 @@ aside #viewcontacts { text-align: right;}
#acl-wrapper-end,
#profile-jot-end { clear: both; height: 5px; }
/**
* section
*/
@ -441,7 +444,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
height: 30px;
}
.wallwall .wwto img { width: 30px; height: 30px;}
.wallwall .wwto img { width: 30px!important; height: 30px!important;}
.wallwall .wall-item-photo-end { clear: both; }
.wall-item-arrowphoto-wrapper {
position: absolute;
@ -474,7 +477,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
.ccollapse-wrapper { font-size: 0.9em; margin-left: 80px; }
.wall-item-outside-wrapper.comment { margin-left: 80px; }
.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px; height: 40px;}
.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important;}
.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; }
.wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
width: 50px; top: 45px; background-position: 35px center;
@ -719,7 +722,8 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
/**
* contacts selector
*/
#group-edit-desc { margin: 10px 0xp; }
#group-members,
#prof-members {
height: 200px;
overflow: auto;
@ -728,6 +732,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
-moz-border-radius: 5px 5px 0px 0px;
border-radius: 5px 5px 0px 0px;
}
#group-all-contacts,
#prof-all-contacts {
height: 200px;
overflow: auto;
@ -736,6 +741,8 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
-moz-border-radius: 0px 0px 5px 5px;
border-radius: 0px 0px 5px 5px;
}
#group-members h3,
#group-all-contacts h3,
#prof-members h3,
#prof-all-contacts h3{
color: #eeeeec;
@ -743,7 +750,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
margin: 0px;
padding: 5px;
}
#group-separator,
#prof-separator { display: none;}
/**
@ -807,7 +814,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
.attachtype {
display: block; width: 20px; height: 23px;
background-image: url('../../../images/content-types.gif');
background-image: url('../../../images/content-types.png');
}
.type-video { background-position: 0px; 0px; }

View file

@ -2434,7 +2434,7 @@ a.mail-list-link {
.attachtype {
display: block; width: 20px; height: 23px;
float: left;
background-image: url('../../../images/content-types.gif');
background-image: url('../../../images/content-types.png');
}
.body-attach {

View file

@ -114,8 +114,10 @@ blockquote:before {
#profile-link,
#profile-title,
#wall-image-upload,
#wall-file-upload,
#profile-upload-wrapper,
#wall-image-upload-div,
#wall-file-upload-div,
.hover, .focus {
cursor: pointer;
}
@ -1203,7 +1205,10 @@ padding: 5px 10px 0px;
float: left;
margin-left: 30px;
}
#profile-attach-wrapper {
float: left;
margin-left: 30px;
}
#profile-rotator {
float: left;
margin-left: 30px;
@ -2445,7 +2450,7 @@ a.mail-list-link {
.attachtype {
display: block; width: 20px; height: 23px;
float: left;
background-image: url('../../../images/content-types.gif');
background-image: url('../../../images/content-types.png');
}
.body-attach {