Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Haakon Meland Eriksen 2016-03-06 18:33:28 +01:00
commit a1e4940bea
3 changed files with 3 additions and 1 deletions

View File

@ -1023,6 +1023,7 @@ function widget_cover_photo($arr) {
'$photo_html' => $photo_html, '$photo_html' => $photo_html,
'$title' => $title, '$title' => $title,
'$subtitle' => $subtitle, '$subtitle' => $subtitle,
'$hovertitle' => t('Click to show more'),
)); ));
} }
return $o; return $o;

View File

@ -129,6 +129,7 @@ li:hover .group-edit-icon {
position: relative; position: relative;
width: 100%; width: 100%;
height: auto; height: auto;
cursor: pointer;
} }
#cover-photo-caption { #cover-photo-caption {

View File

@ -40,7 +40,7 @@
} }
</script> </script>
<div id="cover-photo" onclick="slideUpCover();"> <div id="cover-photo" onclick="slideUpCover();" title="{{$hovertitle}}">
{{$photo_html}} {{$photo_html}}
<div id="cover-photo-caption"> <div id="cover-photo-caption">
<div class="cover-photo-title"> <div class="cover-photo-title">