Merge remote-tracking branch 'origin/dispy' into dispy

This commit is contained in:
fabrixxm 2011-05-02 22:00:17 +02:00
commit d359b5088f
3 changed files with 740 additions and 0 deletions

View File

@ -0,0 +1,726 @@
body {
margin: 0px;
padding: 0px;
font-family: freesans,helvetica,arial,clean,sans-serif;
font-size: 16px;
}
img { border: 0 none; }
a { color: #3465a4; text-decoration: none; margin-bottom:1px;}
a:hover { color: #729fcf; padding-bottom: 0px; border-bottom: 1px dotted #729fcf;}
.required { display: inline; color: #ff0000;}
.fakelink { color: #3465a4; cursor: pointer; }
.fakelink :hover{ color: #729fcf; }
input[type=submit] {
margin-top: 20px;
height: 22px;
background-color: #555753;
color: #eeeeec;
-webkit-border-radius: 5px ;
-moz-border-radius: 5px;
border-radius: 5px;
border: 0px;
}
.smalltext { font-size: 0.7em }
#panel {
position: absolute;
font-size:0.8em;
-webkit-border-radius: 5px ;
-moz-border-radius: 5px;
border-radius: 5px;
border: 1px solid #ffffff;
background-color: #2e3436;
color: #eeeeec;
padding:1em;
}
/**
* login
*/
#login-extra-links a { margin-right: 20px; }
/*********
* nav
*********/
nav {
height: 50px;
display: block;
background-color: #2e3436;
color: #eeeeec;
position: relative;
padding: 0px 10%;
}
nav a { text-decoration: none; color: #eeeeec; border:0px;}
nav a:hover { text-decoration: none; color: #eeeeec; border:0px;}
nav #banner {
display: block;
position: absolute;
margin-left: 20px;
}
nav #banner #logo-text a {
font-size: 40px;
font-weight: bold;
margin-left: 3px;
}
nav #user-menu {
display: block;
width: auto;
float: right;
margin-top: 22px;
margin-right: 10px;
position: relative;
vertical-align: middle;
background-color: #555753;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
}
nav #user-menu-label {
float: left;
font-size: 12px;
padding: 3px 20px 9px 5px;
height: 10px;
}
ul#user-menu-popup {
display: none;
position: absolute;
background-color: #555753;
width: 100%;
padding: 10px 0px;
margin: 0px;
top: 20px;
left: 0px;
-webkit-border-radius: 0px 0px 5px 5px;
-moz-border-radius: 0px 0px 5px 5px;
border-radius: 0px 0px 5px 5px;
z-index: 10000;
}
ul#user-menu-popup li { display: block; }
ul#user-menu-popup li a { display: block; padding: 5px; }
ul#user-menu-popup li a:hover { color: #2e3436; background-color: #eeeeec; }
ul#user-menu-popup li a.nav-sep { border-top: 1px solid #eeeeec; }
nav .nav-link {
float: right;
display: block;
width: 22px;
height: 22px;
/*border: 1px solid #eeeeec;*/
overflow: hidden;
margin-top: 22px;
margin-right: 10px;
text-indent: 50px;
background: transparent url('icons.png') 0px 0px no-repeat;
}
#nav-directory-link { background-position: 0px -22px }
#nav-directory-link:hover { background-position: -22px -22px;}
#nav-search-link { background-position: 0px -44px }
#nav-search-link:hover { background-position: -22px -44px;}
#nav-apps-link { background-position: 0px -66px }
#nav-apps-link:hover { background-position: -22px -66px;}
#nav-login-link { background-position: 0px -88px }
#nav-login-link:hover { background-position: -22px -88px;}
#notifications {
height: 20px; width: 100%;
position: absolute;
top:-19px; left: 0px;
}
.nav-ajax-update {
width: 30px;
height: 19px;
background: transparent url('notifications.png') 0px 0px no-repeat;
color: #ffffff;
font-weight: bold;
font-size: 0.8em;
padding-top: 0.2em;
text-align: center;
float: left;
margin-right: -4px;
display: none;
}
#net-update { background-position: 0px 0px; }
#mail-update { background-position: -30px 0px; }
#notify-update { background-position: -60px 0px; }
#home-update { background-position: -90px 0px; }
/** sysmsg **/
#sysmsg {
position:fixed;
bottom: 0px; right:10%;
-moz-box-shadow: 0px 0px 5px #888;
-webkit-box-shadow: 0px 0px 5px #888;
box-shadow: 0px 0px 5px #888;
padding: 10px;
background-color: #fcaf3e; border:2px solid #f8911b;
border-bottom:0px;
padding-bottom: 50px;
z-index: 1000;
}
#sysmsg br {
display:block;
margin:2px 0px;
border-top: 1px solid #ccccce;
}
/**
* aside
**/
aside {
position: absolute;
right: 11%;
width: 200px;
font-size: 0.7em;
}
.vcard .fn { font-size: 1.7em; font-weight: bold; border-bottom: 1px solid #729fcf; padding-top: 1px;}
.vcard #profile-photo-wrapper { margin: 10px 0px }
aside h4 { font-size: 1.2em; }
aside #viewcontacts { text-align: right;}
#profile-extra-links ul { margin-left: 0px; padding-left: 0px; list-style: none; }
#dfrn-request-link {
background: #3465A4 url('connect.png') no-repeat right center;
border-radius: 5px 5px 5px 5px;
color: #FFFFFF;
display: block;
font-size: 1.2em;
padding: 0.2em 0.5em;
}
/**
* contacts block
*/
.contact-block-div { width: 50px; height: 50px; float: left; }
#contact-block-end { clear: both; }
/**
* jot
**/
#profile-jot-text_tbl { margin-bottom: 10px; }
#profile-jot-text_ifr { width: 99.9%!important }
#profile-jot-submit-wrapper { float: right;}
#profile-jot-perms {
float: right;
background-color: #555753;
height: 22px; width: 20px;
-webkit-border-radius: 0px 5px 5px 0px;
-moz-border-radius: 0px 5px 5px 0px;
border-radius: 0px 5px 5px 0px;
overflow: hidden;
border: 0px;
margin-left:2px;
}
#profile-jot-submit {
float: right;
height: 22px;
background-color: #555753;
color: #eeeeec;
-webkit-border-radius: 5px 0px 0px 5px;
-moz-border-radius: 5px 0px 0px 5px;
border-radius: 5px 0px 0px 5px;
border: 0px;
margin-top: 0px;
}
#character-counter {
float: right; padding: 8px 10px;
}
#profile-rotator-wrapper {
float: right;
}
.jot-tool {
float: left;
margin-right: 5px;
}
#profile-jot-tools-end,
#profile-jot-banner-end { clear: both; }
#profile-jot-email-wrapper {
<<<<<<< HEAD
margin: 10px 10% 0px 10%;
=======
margin: 10px 20% 0px 20%;
>>>>>>> origin/dispy
border: 1px solid #555753;
border-bottom: 0px;
}
#profile-jot-email-label { background-color: #555753; color: #ccccce; padding: 5px;}
#profile-jot-email { margin: 5px; width: 90%; }
#profile-jot-networks {
<<<<<<< HEAD
margin: 0px 10%;
=======
margin: 0px 20%;
>>>>>>> origin/dispy
border: 1px solid #555753;
border-top: 0px;
border-bottom: 0px;
padding: 5px;
}
#profile-jot-acl-wrapper {
<<<<<<< HEAD
margin: 0px 10%;
=======
margin: 0px 20%;
>>>>>>> origin/dispy
border: 1px solid #555753;
border-top: 0px;
}
#group_allow_wrapper,
#group_deny_wrapper,
#acl-permit-outer-wrapper { width: 47%; float: left; }
#contact_allow_wrapper,
#contact_deny_wrapper,
#acl-deny-outer-wrapper { width: 47%; float: right; }
#acl-permit-text,
#acl-deny-text {background-color: #555753; color: #ccccce; padding: 5px;}
#acl-permit-wrapper,
#acl-deny-wrapper { padding: 5px; }
#acl-allow-group-label,
#acl-allow-contact-label,
#acl-deny-group-label,
#acl-deny-contact-label { display: block }
#profile-jot-acl-wrapper select { width: 100%; }
#acl-wrapper-end,
#profile-jot-end { clear: both; height: 5px; }
/**
* section
*/
section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
/** tabs **/
.tabs-wrapper {list-style: none; padding: 0px; margin: 0px; border-bottom: 1px solid #729fcf; }
.tabs-wrapper li { display: inline;}
.tabs { padding: 0px 5px; margin-right: 10px; }
.tabs:hover { background-color: #729fcf; color: #eeeeec; border: 0px; }
/**
* items
*/
.wall-item-outside-wrapper {
margin-top: 50px;
}
.wall-item-outside-wrapper-end { clear: both;}
.wall-item-content-wrapper { position: relative; }
.wall-item-photo-menu { display: none;}
.wall-item-photo-menu-button {
display:none;
text-indent: -9999px;
background: #555753 url("menu-user-pin.jpg") no-repeat 75px center;
position: absolute;
overflow: hidden;
height: 20px; width: 90px;
top: 85px; left: 0px;
-webkit-border-radius: 0px 0px 5px 5px;
-moz-border-radius: 0px 0px 5px 5px;
border-radius: 0px 0px 5px 5px;
}
.wall-item-info { float: left; width: 140px; }
.wall-item-photo-wrapper {
width: 80px; height: 80px;
position: relative;
padding: 5px;
background-color: #555753;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
.wall-item-tools {
float: right;
/*height: 0px;
padding-top: 20px;
overflow:hidden;
background: #ffffff url("icons.png") no-repeat -50px -40px;*/
filter: alpha(opacity=20);
opacity: 0.2;
-webkit-transition: all 1s ease-in-out;
-moz-transition: all 1s ease-in-out;
-o-transition: all 1s ease-in-out;
-ms-transition: all 1s ease-in-out;
transition: all 1s ease-in-out;
}
.wall-item-tools:hover {
/*height:auto;*/
filter: alpha(opacity=100);
opacity: 1;
-webkit-transition: all 1s ease-in-out;
-moz-transition: all 1s ease-in-out;
-o-transition: all 1s ease-in-out;
-ms-transition: all 1s ease-in-out;
transition: all 1s ease-in-out;
}
.wall-item-title { font-size: 1.2em; font-weight: bold;}
.wall-item-body { margin-left: 140px;}
.wall-item-lock-wrapper { float: right; }
.wall-item-dislike,
.wall-item-like,
.wall-item-author { clear: left; font-size: 0.8em; margin: 10px 0px 0px 140px; color: #babdb6;}
.wall-item-ago { display: inline; padding-left: 10px;}
.wall-item-wrapper-end { clear:both; }
.wall-item-location {
margin-top:5px;
width: 100px;
overflow: hidden;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
}
.wall-item-location .icon { float: left; }
<<<<<<< HEAD
.wall-item-location > a { margin-left: 25px; font-size: 0.7em; display: block;}
.wall-item-location .smalltext { margin-left: 25px; font-size: 0.7em; display: block;}
.wall-item-location > br { display: none; }
=======
.wall-item-location a { margin-left: 25px; display: block; font-size: 0.7em; }
>>>>>>> origin/dispy
.wallwall .wwto {
left: -10px;
margin: 0;
position: absolute;
top: 65px;
width: 30px;
z-index: 10001;
width: 30px;
height: 30px;
}
.wallwall .wwto img { width: 30px; height: 30px;}
.wallwall .wall-item-photo-end { clear: both; }
.wall-item-arrowphoto-wrapper {
position: absolute;
left: 20px;
top: 70px;
z-index: 10002;
}
.wall-item-photo-menu {
min-width: 92px;
border: 2px solid #FFFFFF;
border-top: 0px;
background: #555753;
position: absolute;
left: -2px; top: 101px;
display: none;
z-index: 10000;
-webkit-border-radius: 0px 5px 5px 5px;
-moz-border-radius: 0px 5px 5px 5px;
border-radius: 0px 5px 5px 5px;
}
.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
.wall-item-photo-menu li a { white-space: nowrap; display: block; padding: 5px 2px; color: #eeeeec; }
.wall-item-photo-menu li a:hover { color: #555753; background: #eeeeec; }
/**
* comment
*/
.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-wrapper {width: 40px; height: 40px; }
.wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
width: 50px; top: 45px; background-position: 35px center;
}
.wall-item-outside-wrapper.comment .wall-item-info { width: 60px; }
.wall-item-outside-wrapper.comment .wall-item-body { margin-left: 60px;}
.wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px;}
.wall-item-outside-wrapper.comment .wall-item-photo-menu {
min-width: 50px;
top: 60px;
}
.comment-wwedit-wrapper,
.comment-edit-wrapper { margin: 30px 0px 0px 80px;}
.comment-wwedit-wrapper img,
.comment-edit-wrapper img { width: 20px; height: 20px; }
.comment-edit-photo-link { float: left; width: 40px;}
.comment-edit-text-empty { width: 80%; height: 20px; border: 0px; color: #babdb6;
-webkit-transition: all 0.5s ease-in-out;
-moz-transition: all 0.5s ease-in-out;
-o-transition: all 0.5s ease-in-out;
-ms-transition: all 0.5s ease-in-out;
transition: all 0.5s ease-in-out;
}
.comment-edit-text-empty:hover { color: #999999;}
.comment-edit-text-full { width: 80%; height: 6em;
-webkit-transition: all 0.5s ease-in-out;
-moz-transition: all 0.5s ease-in-out;
-o-transition: all 0.5s ease-in-out;
-ms-transition: all 0.5s ease-in-out;
transition: all 0.5s ease-in-out;
}
.comment-edit-submit-wrapper { width: 80%; margin-left: 40px; text-align: right; }
.comment-edit-submit {
height: 22px;
background-color: #555753;
color: #eeeeec;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
border: 0px;
}
/**
* photos
**/
.photo-album-image-wrapper,
.photo-top-image-wrapper {
float: left;
margin: 0px 10px 10px 0px;
-moz-box-shadow: 0px 0px 5px #888;
-webkit-box-shadow: 0px 0px 5px #888;
box-shadow: 0px 0px 5px #888;
background-color: #eeeeee;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
height: 265px;
position:relative;
}
.photo-top-image-wrapper a:hover,
#photo-photo a:hover,
.photo-album-image-wrapper a:hover {
border-bottom: 0px;
}
.photo-top-photo,
.photo-album-photo {
-webkit-border-radius: 5px 5px 0px 0px;
-moz-border-radius: 5px 5px 0px 0px;
border-radius: 5px 5px 0px 0px;
}
.photo-top-album-name { position: absolute; bottom: 0px; padding: 0px 5px;}
.caption { position: absolute; bottom: 0px; margin: 0px 5px}
/**
* message
*/
.prvmail-text { width: 100%;}
#prvmail-subject { width: 100%;}
#prvmail-submit-wrapper { margin-top: 10px; }
#prvmail-submit {
float: right;
margin-top: 0px;
}
#prvmail-submit-wrapper > div {
margin-right: 5px;
float: left;
}
.mail-list-outside-wrapper { margin-top: 20px;}
.mail-list-sender { float: left; }
.mail-list-detail { margin-left: 90px; }
.mail-list-sender-name { display: inline; }
.mail-list-date { display: inline; font-size: 0.8em; padding-left: 10px;}
.mail-list-subject { font-size: 1.5em;}
.mail-list-delete-wrapper { float: right; }
.mail-list-outside-wrapper-end { clear: both;}
/**
* contacts
*/
.contact-entry-wrapper { float: left; margin-right: 20px; margin-bottom: 20px; position: relative;}
.contact-entry-direction-wrapper {position: absolute; top: 20px;}
.contact-entry-edit-links { position: absolute; top: 60px; }
.contact-entry-photo {
margin-left:20px;
}
.contact-entry-edit-links .icon {
border: 1px solid #babdb6;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
background-color: #ffffff;
}
#contact-edit-banner-name { font-size: 1.5em; }
#contact-edit-photo-wrapper {position: relative; float: left; padding: 20px;}
#contact-edit-direction-icon { position: absolute; top: 60px; left:0px;}
#contact-edit-nav-wrapper { margin-left: 210px; }
#contact-edit-links { float: left; margin-top: 23px; }
#contact-drop-links { margin-left: 5px; }
#contact-edit-nav-wrapper .icon {
border: 1px solid #babdb6;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
#contact-edit-poll-wrapper { margin-left: 50px; }
#contact-edit-last-update-text { margin-bottom: 15px; }
#contact-edit-last-updated { font-weight: bold; }
#contact-edit-poll-text { display: inline; }
#contact-edit-end { clear: both; }
/**
* register, settings & profile forms
*/
#settings-nickname-desc {
background-color: #DDEFFF;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
padding: 5px;
}
#register-form div,
#profile-edit-form div,
#settings-form div {
clear: both;
}
#register-form label,
#profile-edit-form label,
#settings-form label {
width: 300px; float: left;
}
#register-form span,
#profile-edit-form span,
#settings-form span {
color: #555753;
display:block;
margin-bottom: 20px;
}
.settings-submit-wrapper,
.profile-edit-submit-wrapper { margin: 30px 0px;}
.profile-listing { float: left; margin: 20px 20px 0px 0px}
#profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; }
#register-sitename { display: inline; font-weight: bold;}
/**
* contacts selector
*/
#prof-members {
height: 200px;
overflow: auto;
border: 1px solid #555753;
-webkit-border-radius: 5px 5px 0px 0px;
-moz-border-radius: 5px 5px 0px 0px;
border-radius: 5px 5px 0px 0px;
}
#prof-all-contacts {
height: 200px;
overflow: auto;
border: 1px solid #555753;
-webkit-border-radius: 0px 0px 5px 5px;
-moz-border-radius: 0px 0px 5px 5px;
border-radius: 0px 0px 5px 5px;
}
#prof-members h3,
#prof-all-contacts h3{
color: #eeeeec;
background-color: #555753;
margin: 0px;
padding: 5px;
}
#prof-separator { display: none;}
/**
* directory
*/
.directory-item {float: left; margin: 50px 50px 0px 0px;}
/**
* ICONS
*/
.icon {
display: block; width: 20px; height: 20px;
background-image: url('icons.png');
}
/*.icon:hover {
border-bottom: 0px;
}*/
.border {
border: 1px solid #babdb6;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.article { background-position: -50px 0px;}
.audio { background-position: -70px 0px;}
.block { background-position: -90px 0px;}
.drop { background-position: -110px 0px;}
.drophide { background-position: -130px 0px;}
.edit { background-position: -150px 0px;}
.camera { background-position: -170px 0px;}
.dislike { background-position: -190px 0px;}
.like { background-position: -210px 0px;}
.link { background-position: -230px 0px;}
.globe { background-position: -50px -20px;}
.noglobe { background-position: -70px -20px;}
.no { background-position: -90px -20px;}
.pause { background-position: -110px -20px;}
.play { background-position: -130px -20px;}
.pencil { background-position: -150px -20px;}
.small-pencil{ background-position: -170px -20px;}
.recycle { background-position: -190px -20px;}
.remote-link{ background-position: -210px -20px;}
.share { background-position: -230px -20px;}
.tools { background-position: -50px -40px;}
.lock { background-position: -70px -40px;}
.unlock { background-position: -90px -40px;}
.video { background-position: -110px -40px;}
.youtube { background-position: -130px -40px;}
/**
* footer
*/ .cc-license { margin-top: 100px; font-size: 0.7em; }
footer { display: block; margin: 50px 20%; clear: both; }

View File

@ -990,6 +990,10 @@ input#dfrn-url {
border-right: 2px solid #fff;
}
.wall-item-like-buttons > a,
.wall-item-like-buttons > img {
float: left;
}
.wall-item-like-buttons img {
cursor: pointer;
@ -1445,6 +1449,9 @@ input#dfrn-url {
#contact-edit-links {
float: left;
}
#contact-edit-links a {
float: left;
}
#contact-edit-links img {
margin-left: 20px;
border: none;

View File

@ -1051,6 +1051,10 @@ input#dfrn-url {
padding-right: 10px;
border-right: 2px solid #fff;
}
.wall-item-like-buttons > a,
.wall-item-like-buttons > img {
float: left;
}
.wall-item-share-buttons {
margin-left: 5px;
@ -1508,6 +1512,9 @@ padding: 5px 10px 0px;
#contact-edit-links {
float: left;
}
#contact-edit-links a {
float: left;
}
#contact-edit-links img {
margin-left: 20px;
border: none;