diff --git a/include/bbcode.php b/include/bbcode.php index bc3076777..8ef144ea0 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -489,13 +489,16 @@ function bb_ShareAttributes($share, $simplehtml) { $text .= "

".$link; break; default: - $headline = trim($share[1]).'
'; + $headline = trim($share[1])."\n"; + $headline .= '
'."\n"; + $headline .= '
'."\n"; if ($avatar != "") $headline .= ''; $headline .= sprintf(t('%s wrote the following post'.$reldate.':'), $profile, $author, $link); - $headline .= "
"; - $text = $headline.'
'.trim($share[3])."
"; + $headline .= "
\n"; + $text = $headline.'
'.trim($share[3])."
\n"; + $text .= "
\n"; break; } return($text); diff --git a/view/fonts/friendica_shashape.ttf b/view/fonts/friendica_shashape.ttf index 0bb5a577a..a70fa4ae1 100644 Binary files a/view/fonts/friendica_shashape.ttf and b/view/fonts/friendica_shashape.ttf differ diff --git a/view/fonts/shashape.css b/view/fonts/shashape.css index 5f4494dde..b1a003231 100644 --- a/view/fonts/shashape.css +++ b/view/fonts/shashape.css @@ -62,10 +62,10 @@ .shashape.profile:before{ content: "p"; } -.shashape.skip:before{ +.shashape.profileneg:before{ content: "q"; } -.shashape.reload:before{ +.shashape.heard:before{ content: "r"; } .shashape.search:before{ @@ -74,9 +74,6 @@ .shashape.time:before{ content: "t"; } -.shashape.undo:before{ - content: "u"; -} .shashape.logout:before, .shashape.logged-in:before{ content: "v"; @@ -104,17 +101,16 @@ .shashape.nolike:before{ content: "C"; } -/* uppercase D is not defined at the moment - .shashape.hash:before{ +.shashape.grrrr:before{ content: "D"; -} */ +} .shashape.arrow7:before{ content: "E"; } .shashape.follow:before{ content: "F"; } -.shashape.follower:before{ +.shashape.retweet:before{ content: "G"; } .shashape.hand:before{ @@ -129,10 +125,9 @@ .shashape.arrow-updown:before{ content: "K"; } -/* uppercase L is not defined at the moment -.shashape.lock:before{ +.shashape.arrow-sideup:before{ content: "L"; -} */ +} .shashape.arrow-left:before{ content: "M"; } @@ -180,39 +175,64 @@ content: "#"; } .shashape.tag:before{ - content: "="; + content: "&"; } .shashape.lock-open:before{ - content: "?"; + content: "("; } .shashape.lock-closed:before{ content: ")"; } +.shashape.blank:before { + content: "_"; +} +.shashape.ellipsis:before { + content: "ยง"; +} +.shashape.ok.before, .shashape.yes:before{ content: "+"; } .shashape.hmm:before{ - content: ","; + content: "%"; } +.shashape.mark:before, .shashape.no:before{ content: "-"; } -.shashape.blank:before{ +.shashape.see:before{ content: "."; } -.shashape.see:before{ +.shashape.see2:before{ content: ":"; } -.shashape.blind:before{ +.shashape.see3:before{ content: ";"; } +.shashape.blind:before{ + content: ","; +} .shashape.edit:before{ content: "<"; } .shashape.stamp:before{ content: ">"; } -.shashape.heart:before{ - content: "_"; +.shashape.comment:before { + content: "*"; +} +.shashape.ask:before { + content: "?"; +} +.shashape.skip:before { + content: "{"; +} +.shashape.reload:before { + content: "["; +} +.shashape.reloadreverse:before { + content: "]"; +} +.shashape.undo:before { + content: "]"; } - diff --git a/view/fonts/shashape.jpg b/view/fonts/shashape.jpg index a4f20ce64..6e0fff004 100644 Binary files a/view/fonts/shashape.jpg and b/view/fonts/shashape.jpg differ diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 7d45bddbe..4d7e4e2cb 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1702,10 +1702,29 @@ ul.viewcontact_wrapper > li { .contact-entry-checkbox { margin-top: -20px; } -.contact-wrapper .media-body .contact-entry-name h4.media-heading { - font-weight: bold; - color: #777; - font-size: 15px; +.contact-wrapper .media-body .contact-entry-name h4.media-heading a { + font-weight: bold !important; + color: $link_color; + 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, #directory-search-wrapper{ diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact_template.tpl index bfffec0ce..4c2395fd0 100644 --- a/view/theme/frio/templates/contact_template.tpl +++ b/view/theme/frio/templates/contact_template.tpl @@ -46,10 +46,20 @@
+ {{* The contact actions like private mail, delete contact, edit contact and so on *}} + + {{* The contact description (e.g. Name, Network, kind of connection and so on *}}
-

{{$contact.name}} +

{{$contact.name}} {{if $contact.account_type}} ({{$contact.account_type}}){{/if}} {{if $contact.account_type == 'Forum'}}{{/if}} {{* @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 *}}

-
{{* @todo There is a bug with this class - the browser freezes if the screensize is to small - but only fith textcomplete*}} +
+ {{* The contact actions like private mail, delete contact, edit contact and so on *}} + + {{* The contact description (e.g. Name, Network, kind of connection and so on *}}
-

{$name} +

{$name} {if $account_type} ({$account_type}){/if} {if $account_type == 'Forum'}{/if} {{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}