friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge https://github.com/friendica/friendica into pull

This commit is contained in:
friendica 2012-04-27 01:10:33 -07:00
parent f06a554e05 8aead9e517
commit 153534bc70
5 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
view/theme/dispy/dark/style.css
View File

@ -215,7 +215,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wall-item-body code{display:block;padding:0 0 10px 5px;border-color:#ccc;border-style:solid;border-width:1px 1px 1px 10px;background:#eee;color:#2e2f2e;width:95%;}
div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;}
div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
[id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;}
.profile-match-end{margin:0 0 5px 0;}
.profile-match-name{font-weight:bold;margin:auto auto auto 23px;}
.profile-match-connect{font-style:italic;margin:auto auto auto 23px;}
#advanced-profile-with{margin-left:200px;}
.photos{height:auto;overflow:auto;}
#photo-top-links{margin-bottom:30px;}

26
view/theme/dispy/dark/style.less
View File

@ -1385,10 +1385,36 @@ div {
br {
clear: left; } } }
.profile-match-wrapper {
float: left;
margin: 0 5px 40px 0;
width: 120px;
height: 120px;
padding: 3px;
position: relative;
}
.icon.drophide.profile-match-ignore {
margin: 0 6px 0 -3px;
}
.profile-match-photo {
}
[id$="-end"], [class$="end"] {
clear: both;
margin: 0 0 10px 0; }
.profile-match-end {
margin: 0 0 5px 0;
}
.profile-match-name {
font-weight: bold;
margin: auto auto auto 23px;
}
.profile-match-connect {
font-style: italic;
margin: auto auto auto 23px;
}
#advanced-profile-with {
margin-left: 200px; }

5
view/theme/dispy/light/style.css
View File

@ -215,7 +215,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wall-item-body code{display:block;padding:0 0 10px 5px;border-color:#ccc;border-style:solid;border-width:1px 1px 1px 10px;background:#eee;color:#444;width:95%;}
div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;}
div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
[id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;}
.profile-match-end{margin:0 0 5px 0;}
.profile-match-name{font-weight:bold;margin:auto auto auto 23px;}
.profile-match-connect{font-style:italic;margin:auto auto auto 23px;}
#advanced-profile-with{margin-left:200px;}
.photos{height:auto;overflow:auto;}
#photo-top-links{margin-bottom:30px;}

26
view/theme/dispy/light/style.less
View File

@ -1386,10 +1386,36 @@ div {
br {
clear: left; } } }
.profile-match-wrapper {
float: left;
margin: 0 5px 40px 0;
width: 120px;
height: 120px;
padding: 3px;
position: relative;
}
.icon.drophide.profile-match-ignore {
margin: 0 6px 0 -3px;
}
.profile-match-photo {
}
[id$="-end"], [class$="end"] {
clear: both;
margin: 0 0 10px 0; }
.profile-match-end {
margin: 0 0 5px 0;
}
.profile-match-name {
font-weight: bold;
margin: auto auto auto 23px;
}
.profile-match-connect {
font-style: italic;
margin: auto auto auto 23px;
}
#advanced-profile-with {
margin-left: 200px; }

2
view/theme/dispy/wall_item.tpl
View File

@ -40,7 +40,7 @@
</ul><br style="clear:left;" />
<ul class="wall-item-subtools2">
{{ if $item.filer }}
<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.filer"></a></li>
{{ endif }}
{{ if $item.plink }}
<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>