harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-04-06 16:18:57 -07:00
commit b880982b61
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/conversation.php
View File

@ -1296,7 +1296,7 @@ function render_location_default($item) {
if($coord) {
if($location)
$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
$location .= '&nbsp;<span class="smalltext">(' . $coord . ')</span>';
else
$location = '<span class="smalltext">' . $coord . '</span>';
}

5
view/css/conversation.css
View File

@ -164,11 +164,6 @@
padding: 3px 20px;
}
.wall-item-location {
text-overflow: ellipsis;
max-width: 30%;
}
.wall-item-author {
margin-top: 10px;
}

4
view/theme/redbasic/css/style.css
View File

@ -233,10 +233,6 @@ footer {
color: #444444 !important;
}
.smalltext {
font-size: 0.7em;
}
#sysmsg {
margin-bottom: 10px;
}

6
view/tpl/jot.tpl
View File

@ -51,12 +51,12 @@
<button id="profile-audio-wrapper" class="btn btn-default btn-sm" style="display: {{$visitor}};" title="{{$audio}}" onclick="jotAudioURL();return false;">
<i id="profile-audio" class="icon-volume-up jot-icons"></i>
</button>
<button id="profile-location-wrapper" class="btn btn-default btn-sm" style="display: {{$visitor}};" title="{{$setloc}}" onclick="jotGetLocation();return false;">
<i id="profile-location" class="icon-globe jot-icons"></i>
</button>
<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;">
<i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
</button>
<button id="profile-location-wrapper" class="btn btn-default btn-sm" style="display: {{$visitor}};" title="{{$setloc}}" onclick="jotGetLocation();return false;">
<i id="profile-location" class="icon-globe jot-icons"></i>
</button>
<button id="profile-expire-wrapper" class="btn btn-default btn-sm" style="display: {{$feature_expire}};" title="{{$expires}}" onclick="jotGetExpiry();return false;">
<i id="profile-expires" class="icon-eraser jot-icons"></i>
</button>