diff options
| author | friendica <info@friendica.com> | 2014-04-06 16:18:57 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-06 16:18:57 -0700 |
| commit | b880982b614dc1397f2bbf1059dff0c04efe3c51 (patch) | |
| tree | 31befc2d562c38debd41b800848441ba8122adc0 | |
| parent | 50c608482a3baddd56a60f082de68fe4a6e33213 (diff) | |
| parent | f7cb4e0ef0b6d40427858810404ad9caedb27ae3 (diff) | |
| download | volse-hubzilla-b880982b614dc1397f2bbf1059dff0c04efe3c51.tar.gz volse-hubzilla-b880982b614dc1397f2bbf1059dff0c04efe3c51.tar.bz2 volse-hubzilla-b880982b614dc1397f2bbf1059dff0c04efe3c51.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | view/css/conversation.css | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 6 |
4 files changed, 4 insertions, 13 deletions
diff --git a/include/conversation.php b/include/conversation.php index 149da3ac7..df3f5f03c 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1296,7 +1296,7 @@ function render_location_default($item) { if($coord) { if($location) - $location .= '<br /><span class="smalltext">(' . $coord . ')</span>'; + $location .= ' <span class="smalltext">(' . $coord . ')</span>'; else $location = '<span class="smalltext">' . $coord . '</span>'; } diff --git a/view/css/conversation.css b/view/css/conversation.css index c9894f638..ee26bbf47 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -164,11 +164,6 @@ padding: 3px 20px; } -.wall-item-location { - text-overflow: ellipsis; - max-width: 30%; -} - .wall-item-author { margin-top: 10px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 688dcf478..0788775e7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -233,10 +233,6 @@ footer { color: #444444 !important; } -.smalltext { - font-size: 0.7em; -} - #sysmsg { margin-bottom: 10px; } diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 5f79b4d88..87a9b721f 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -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> |