mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
zottel 2012-04-27 23:05:38 +02:00
parent 17aba3033f a632f03531
commit edc7e571b7
7 changed files with 161 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
view/contact_block.tpl
View file

@ -1,7 +1,7 @@
<div id="contact-block">
<h4 class="contact-block-h4">$contacts</h4>
{{ if $micropro }}
<a class="allcontact-link" href="contacts/$nickname">$viewcontacts</a>
<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
<div class='contact-block-content'>
{{ for $micropro as $m }}
$m

17
view/theme/dispy/dark/style.css
View file

@ -103,11 +103,11 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{box-shadow:3px 3px 10px 0 #000;}
#asidemain h4{font-size:1.2em;}
#asidemain #viewcontacts{text-align:right;}
#asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;}
.aprofile dt{background:#eec;color:#2e2f2e;font-weight:bold;box-shadow:1px 1px 5px 0 #000;margin:15px 0 5px;padding-left:5px;}
#profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
#dfrn-request-link{background:#3465a4 url(dark/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#eec;display:block;font-size:1.2em;padding:0.2em 0.5em;}
#wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;}
#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
.ttright{margin:0px 0px 0px 0px;}
.contact-block-div{width:50px;height:50px;float:left;}
.contact-block-textdiv{width:150px;height:34px;float:left;}
@ -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;}
[id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;}
.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;}
@ -227,8 +232,8 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
.caption{position:absolute;bottom:0;margin:0 5px;}
#photo-photo{position:relative;float:left;}
#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;background-position:center center;background-repeat:no-repeat;}
#photo-prev-link{left:0;top:0;background-image:url(dark/prev.png);}
#photo-next-link{right:0;top:0;background-image:url(dark/next.png);}
#photo-prev-link{background-image:url(dark/prev.png);height:350px;left:1%;top:215px;width:50px;z-index:10;}
#photo-next-link{background-image:url(dark/next.png);height:350px;right:45%;top:215px;width:50px;}
#photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;overflow:hidden;text-indent:-900000px;}
#photo-prev-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
#photo-next-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
@ -376,10 +381,10 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
#peoplefind-sidebar form{margin-bottom:10px;}
#sidebar-new-group:hover{}
#sidebar-new-group:active{position:relative;top:1px;}
#side-peoplefind-url{background-color:#2e2f2e;color:#eec;border:1px 999 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
#side-peoplefind-url{background-color:#2e2f2e;color:#eec;border:1px #999 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
.nets-link,.nets-all{margin-left:0px;}
#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;}
#netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
#pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;}
.admin.linklist{border:0;padding:0;}
.admin.link{list-style-position:inside;}

81
view/theme/dispy/dark/style.less
View file

@ -696,7 +696,23 @@ nav #nav-notifications-linkmenu {
h4 {
font-size: 1.2em; }
#viewcontacts {
text-align: right; } }
text-align: right;
}
#contact-block {
width: 99%;
.contact-block-content {
width: 99%;
.contact-block-div {
float: left;
margin: 0 5px 5px 0;
width: 50px;
height: 50px;
padding: 3px;
position: relative;
}
}
}
}
.aprofile dt {
background: #eec;
@ -727,12 +743,6 @@ nav #nav-notifications-linkmenu {
font-size: 1.2em;
padding: 0.2em 0.5em; }
#netsearch-box {
margin: 20px 0px 30px;
width: 150px;
#search-submit {
margin: 5px 5px 0px 0px; } }
.ttright {
margin: 0px 0px 0px 0px; }
@ -1385,10 +1395,36 @@ div {
br {
clear: left; } } }
[id$="-end"], [class$="end"] {
.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; }
@ -1459,14 +1495,21 @@ div {
background-repeat: no-repeat; }
#photo-prev-link {
left: 0;
top: 0;
background-image: url(dark/prev.png); }
background-image: url(dark/prev.png);
height: 350px;
left: 1%;
top: 215px;
width: 50px;
z-index: 10;
}
#photo-next-link {
right: 0;
top: 0;
background-image: url(dark/next.png); }
background-image: url(dark/next.png);
height: 350px;
right: 45%;
top: 215px;
width: 50px;
}
#photo-prev-link a, #photo-next-link a {
display: block;
@ -2155,7 +2198,7 @@ div {
#side-peoplefind-url {
background-color: #2e2f2e;
color: #eec;
border: 1px 999 solid;
border: 1px #999 solid;
margin-right: 3px;
width: 75%;
&:hover, &:focus {
@ -2173,10 +2216,12 @@ div {
margin-left: 0px; }
#netsearch-box {
margin-top: 20px;
width: 150px;
margin: 20px 0px 30px;
width: 135px;
#search-submit {
margin: 5px 0px 0px 0px; } }
margin: 5px 5px 0px 0px;
}
}
/**
* admin

17
view/theme/dispy/light/style.css
View file

@ -103,11 +103,11 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{box-shadow:3px 3px 10px 0 #000;}
#asidemain h4{font-size:1.2em;}
#asidemain #viewcontacts{text-align:right;}
#asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;}
.aprofile dt{background:transparent;color:#666666;font-weight:bold;box-shadow:1px 1px 5px 0 #000;margin:15px 0 5px;padding-left:5px;}
#profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
#dfrn-request-link{background:#3465a4 url(light/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#fff;display:block;font-size:1.2em;padding:0.2em 0.5em;}
#wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;}
#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
.ttright{margin:0px 0px 0px 0px;}
.contact-block-div{width:50px;height:50px;float:left;}
.contact-block-textdiv{width:150px;height:34px;float:left;}
@ -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;}
[id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;}
.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;}
@ -227,8 +232,8 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
.caption{position:absolute;bottom:0;margin:0 5px;}
#photo-photo{position:relative;float:left;}
#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;background-position:center center;background-repeat:no-repeat;}
#photo-prev-link{left:0;top:0;background-image:url(light/prev.png);}
#photo-next-link{right:0;top:0;background-image:url(light/next.png);}
#photo-prev-link{background-image:url(light/prev.png);height:350px;left:1%;top:215px;width:50px;z-index:10;}
#photo-next-link{background-image:url(light/next.png);height:350px;right:45%;top:215px;width:50px;}
#photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;overflow:hidden;text-indent:-900000px;}
#photo-prev-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
#photo-next-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
@ -376,10 +381,10 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
#peoplefind-sidebar form{margin-bottom:10px;}
#sidebar-new-group:hover{}
#sidebar-new-group:active{position:relative;top:1px;}
#side-peoplefind-url{background-color:#e5e0cf;color:#666;border:1px 666 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
#side-peoplefind-url{background-color:#e5e0cf;color:#666;border:1px #666 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
.nets-link,.nets-all{margin-left:0px;}
#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;}
#netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
#pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;}
.admin.linklist{border:0;padding:0;}
.admin.link{list-style-position:inside;}

81
view/theme/dispy/light/style.less
View file

@ -697,7 +697,23 @@ nav #nav-notifications-linkmenu {
h4 {
font-size: 1.2em; }
#viewcontacts {
text-align: right; } }
text-align: right;
}
#contact-block {
width: 99%;
.contact-block-content {
width: 99%;
.contact-block-div {
float: left;
margin: 0 5px 5px 0;
width: 50px;
height: 50px;
padding: 3px;
position: relative;
}
}
}
}
.aprofile dt {
background: transparent;
@ -728,12 +744,6 @@ nav #nav-notifications-linkmenu {
font-size: 1.2em;
padding: 0.2em 0.5em; }
#netsearch-box {
margin: 20px 0px 30px;
width: 150px;
#search-submit {
margin: 5px 5px 0px 0px; } }
.ttright {
margin: 0px 0px 0px 0px; }
@ -1386,10 +1396,36 @@ div {
br {
clear: left; } } }
[id$="-end"], [class$="end"] {
.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; }
@ -1460,14 +1496,21 @@ div {
background-repeat: no-repeat; }
#photo-prev-link {
left: 0;
top: 0;
background-image: url(light/prev.png); }
background-image: url(light/prev.png);
height: 350px;
left: 1%;
top: 215px;
width: 50px;
z-index: 10;
}
#photo-next-link {
right: 0;
top: 0;
background-image: url(light/next.png); }
background-image: url(light/next.png);
height: 350px;
right: 45%;
top: 215px;
width: 50px;
}
#photo-prev-link a, #photo-next-link a {
display: block;
@ -2156,7 +2199,7 @@ div {
#side-peoplefind-url {
background-color: #e5e0cf;
color: #666;
border: 1px 666 solid;
border: 1px #666 solid;
margin-right: 3px;
width: 75%;
&:hover, &:focus {
@ -2174,10 +2217,12 @@ div {
margin-left: 0px; }
#netsearch-box {
margin-top: 20px;
width: 150px;
margin: 20px 0px 30px;
width: 135px;
#search-submit {
margin: 5px 0px 0px 0px; } }
margin: 5px 5px 0px 0px;
}
}
/**
* admin

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>

7
view/theme/duepuntozero/nav.tpl
View file

@ -27,7 +27,9 @@
<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-ajax-left"></span>
{{ endif }}
{{ if $nav.community }}
<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
{{ endif }}
{{ if $nav.introductions }}
<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
<span id="intro-update" class="nav-ajax-left"></span>
@ -58,9 +60,6 @@
{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
{{ if $nav.community }}
<a id="nav-community-link" class="nav-link $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
{{ endif }}
</span>
<span id="nav-end"></span>
<span id="banner">$banner</span>