mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into 1606-dbm

Browse source
This commit is contained in:
Michael Vogel 2016-06-02 07:37:37 +02:00
parent 85a9c7d96e 2bd3deb397
commit 4914e8826b
6 changed files with 93 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/bbcode.php
View file

@ -489,13 +489,16 @@ function bb_ShareAttributes($share, $simplehtml) {
$text .= "<br /><br />".$link; $text .= "<br /><br />".$link;
break; break;
default: default:
$headline = trim($share[1]).'<div class="shared_header">'; $headline = trim($share[1])."\n";
$headline .= '<div class="shared-wrapper">'."\n";
$headline .= '<div class="shared_header">'."\n";
if ($avatar != "") if ($avatar != "")
$headline .= '<img src="'.proxy_url($avatar, false, PROXY_SIZE_MICRO).'" height="32" width="32" >'; $headline .= '<img src="'.proxy_url($avatar, false, PROXY_SIZE_MICRO).'" height="32" width="32" >';
$headline .= sprintf(t('<span><a href="%s" target="_blank">%s</a> wrote the following <a href="%s" target="_blank">post</a>'.$reldate.':</span>'), $profile, $author, $link); $headline .= sprintf(t('<span><a href="%s" target="_blank">%s</a> wrote the following <a href="%s" target="_blank">post</a>'.$reldate.':</span>'), $profile, $author, $link);
$headline .= "</div>"; $headline .= "</div>\n";
$text = $headline.'<blockquote class="shared_content">'.trim($share[3])."</blockquote>"; $text = $headline.'<blockquote class="shared_content">'.trim($share[3])."</blockquote>\n";
$text .= "<div>\n";
break; break;
} }
return($text); return($text);

BIN
view/fonts/friendica_shashape.ttf
View file

Binary file not shown.

62
view/fonts/shashape.css
View file

@ -62,10 +62,10 @@
.shashape.profile:before{ .shashape.profile:before{
content: "p"; content: "p";
} }
.shashape.skip:before{ .shashape.profileneg:before{
content: "q"; content: "q";
} }
.shashape.reload:before{ .shashape.heard:before{
content: "r"; content: "r";
} }
.shashape.search:before{ .shashape.search:before{
@ -74,9 +74,6 @@
.shashape.time:before{ .shashape.time:before{
content: "t"; content: "t";
} }
.shashape.undo:before{
content: "u";
}
.shashape.logout:before, .shashape.logout:before,
.shashape.logged-in:before{ .shashape.logged-in:before{
content: "v"; content: "v";
@ -104,17 +101,16 @@
.shashape.nolike:before{ .shashape.nolike:before{
content: "C"; content: "C";
} }
/* uppercase D is not defined at the moment .shashape.grrrr:before{
.shashape.hash:before{
content: "D"; content: "D";
} */ }
.shashape.arrow7:before{ .shashape.arrow7:before{
content: "E"; content: "E";
} }
.shashape.follow:before{ .shashape.follow:before{
content: "F"; content: "F";
} }
.shashape.follower:before{ .shashape.retweet:before{
content: "G"; content: "G";
} }
.shashape.hand:before{ .shashape.hand:before{
@ -129,10 +125,9 @@
.shashape.arrow-updown:before{ .shashape.arrow-updown:before{
content: "K"; content: "K";
} }
/* uppercase L is not defined at the moment .shashape.arrow-sideup:before{
.shashape.lock:before{
content: "L"; content: "L";
} */ }
.shashape.arrow-left:before{ .shashape.arrow-left:before{
content: "M"; content: "M";
} }
@ -180,39 +175,64 @@
content: "#"; content: "#";
} }
.shashape.tag:before{ .shashape.tag:before{
content: "="; content: "&";
} }
.shashape.lock-open:before{ .shashape.lock-open:before{
content: "?"; content: "(";
} }
.shashape.lock-closed:before{ .shashape.lock-closed:before{
content: ")"; content: ")";
} }
.shashape.blank:before {
content: "_";
}
.shashape.ellipsis:before {
content: "§";
}
.shashape.ok.before,
.shashape.yes:before{ .shashape.yes:before{
content: "+"; content: "+";
} }
.shashape.hmm:before{ .shashape.hmm:before{
content: ","; content: "%";
} }
.shashape.mark:before,
.shashape.no:before{ .shashape.no:before{
content: "-"; content: "-";
} }
.shashape.blank:before{ .shashape.see:before{
content: "."; content: ".";
} }
.shashape.see:before{ .shashape.see2:before{
content: ":"; content: ":";
} }
.shashape.blind:before{ .shashape.see3:before{
content: ";"; content: ";";
} }
.shashape.blind:before{
content: ",";
}
.shashape.edit:before{ .shashape.edit:before{
content: "<"; content: "<";
} }
.shashape.stamp:before{ .shashape.stamp:before{
content: ">"; content: ">";
} }
.shashape.heart:before{ .shashape.comment:before {
content: "_"; content: "*";
}
.shashape.ask:before {
content: "?";
}
.shashape.skip:before {
content: "{";
}
.shashape.reload:before {
content: "[";
}
.shashape.reloadreverse:before {
content: "]";
}
.shashape.undo:before {
content: "]";
} }

BIN
view/fonts/shashape.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 390 KiB

After

Width:  |  Height:  |  Size: 377 KiB

27
view/theme/frio/css/style.css
View file

@ -1702,10 +1702,29 @@ ul.viewcontact_wrapper > li {
.contact-entry-checkbox { .contact-entry-checkbox {
margin-top: -20px; margin-top: -20px;
} }
.contact-wrapper .media-body .contact-entry-name h4.media-heading { .contact-wrapper .media-body .contact-entry-name h4.media-heading a {
font-weight: bold; font-weight: bold !important;
color: #777; color: $link_color;
font-size: 15px; font-size: 15px !important;
}
.contact-wrapper .contact-actions {
display: flex;
}
.contact-wrapper a.contact-action-link {
opacity: 0.1;
}
.contact-wrapper a.contact-action-link,
.contact-wrapper a.contact-action-link:hover,
.textcomplete-item .contact-wrapper a.contact-action-link {
padding-right: 5px;
padding-left: 5px;
color: #555;
}
ul li:hover .contact-wrapper a.contact-action-link {
opacity: 0.8;
}
ul li:hover .contact-wrapper a.contact-action-link:hover {
opacity: 1;
} }
#contacts-search-wrapper, #contacts-search-wrapper,
#directory-search-wrapper{ #directory-search-wrapper{

26
view/theme/frio/templates/contact_template.tpl
View file

@ -46,10 +46,20 @@
</div> </div>
<div class="media-body"> <div class="media-body">
{{* The contact actions like private mail, delete contact, edit contact and so on *}}
<div class="contact-actions pull-right nav-pills preferences hidden-xs">
{{if $contact.photo_menu.pm}}<a class="contact-action-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{{/if}}
{{if $contact.photo_menu.poke}}<a class="contact-action-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{{/if}}
{{if $contact.photo_menu.network}}<a class="contact-action-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
{{if $contact.photo_menu.edit}}<a class="contact-action-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
{{if $contact.photo_menu.drop}}<a class="contact-action-link" href="{{$contact.photo_menu.drop.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{{/if}}
{{if $contact.photo_menu.follow}}<a class="contact-action-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
</div>
{{* The contact description (e.g. Name, Network, kind of connection and so on *}} {{* The contact description (e.g. Name, Network, kind of connection and so on *}}
<div class="contact-entry-desc"> <div class="contact-entry-desc">
<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" > <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >
<h4 class="media-heading">{{$contact.name}} <h4 class="media-heading"><a href="{{$contact.url}}">{{$contact.name}}</a>
{{if $contact.account_type}} <small class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</small>{{/if}} {{if $contact.account_type}} <small class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</small>{{/if}}
{{if $contact.account_type == 'Forum'}}<i class="fa fa-comments-o" aria-hidden="true"></i>{{/if}} {{if $contact.account_type == 'Forum'}}<i class="fa fa-comments-o" aria-hidden="true"></i>{{/if}}
{{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}} {{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}
@ -124,11 +134,21 @@ We use this part to filter the contacts with jquery.textcomplete *}}
</div> </div>
<div class="media-body"> {{* @todo There is a bug with this class - the browser freezes if the screensize is to small - but only fith textcomplete*}} <div class="media-body">
{{* The contact actions like private mail, delete contact, edit contact and so on *}}
<div class="contact-actions pull-right nav-pills preferences hidden-xs">
{if $photo_menu.pm}<a class="contact-action-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{/if}
{if $photo_menu.poke}<a class="contact-action-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{/if}
{if $photo_menu.network}<a class="contact-action-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{/if}
{if $photo_menu.edit}<a class="contact-action-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{/if}
{if $photo_menu.drop}<a class="contact-action-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{/if}
{if $photo_menu.follow}<a class="contact-action-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{/if}
</div>
{{* The contact description (e.g. Name, Network, kind of connection and so on *}} {{* The contact description (e.g. Name, Network, kind of connection and so on *}}
<div class="contact-entry-desc"> <div class="contact-entry-desc">
<div class="contact-entry-name" id="contact-entry-name-{$id}" > <div class="contact-entry-name" id="contact-entry-name-{$id}" >
<h4 class="media-heading">{$name} <h4 class="media-heading"><a href="{url}">{$name}</a>
{if $account_type} <small class="contact-entry-details" id="contact-entry-accounttype-{$id}">({$account_type})</small>{/if} {if $account_type} <small class="contact-entry-details" id="contact-entry-accounttype-{$id}">({$account_type})</small>{/if}
{if $account_type == 'Forum'}<i class="fa fa-comments-o" aria-hidden="true"></i>{/if} {if $account_type == 'Forum'}<i class="fa fa-comments-o" aria-hidden="true"></i>{/if}
{{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}} {{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}