Merge branch 'pull'

This commit is contained in:
Friendika 2011-05-25 15:49:25 -07:00
commit 77d2c44eff
1 changed files with 11 additions and 4 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;}
/**