bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into 1605-frio-template-clean

Browse source
This commit is contained in:
Michael Vogel 2016-05-30 07:24:06 +02:00
commit 5218667196
4 changed files with 167 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
view/theme/frio/css/hovercard.css
View file

@ -286,7 +286,7 @@
display: flex;
}
.hover-card-actions-connection {
margin-left: 30px;
margin-left: 10px;
}
.hovercard .hovercard-content .hover-card-actions a.btn {
display: inline-block;

2
view/theme/frio/js/hovercard.js
View file

@ -40,7 +40,7 @@ $(document).ready(function(){
// Take link href attribute as link to the profile
var profileurl = hrefAttr;
// the url to get the contact and template data
var url = baseurl + "/frio_hovercard";
var url = baseurl + "/hovercard";
// store the title in an other data attribute beause bootstrap
// popover destroys the title.attribute. We can restore it later