Skip to content

Commit

Permalink
Update font-awesome v4
Browse files Browse the repository at this point in the history
  • Loading branch information
jmontoyaa committed Feb 19, 2015
1 parent f246e72 commit abb37d2
Show file tree
Hide file tree
Showing 10 changed files with 1,020 additions and 3,083 deletions.
1,203 changes: 0 additions & 1,203 deletions main/css/font_awesome/css/font-awesome-ie7.css

This file was deleted.

384 changes: 0 additions & 384 deletions main/css/font_awesome/css/font-awesome-ie7.min.css

This file was deleted.

1,704 changes: 1,013 additions & 691 deletions main/css/font_awesome/css/font-awesome.css

Large diffs are not rendered by default.

407 changes: 4 additions & 403 deletions main/css/font_awesome/css/font-awesome.min.css

Large diffs are not rendered by default.

Binary file removed main/css/font_awesome/font/FontAwesome.otf
Binary file not shown.
Binary file removed main/css/font_awesome/font/fontawesome-webfont.eot
Binary file not shown.
399 changes: 0 additions & 399 deletions main/css/font_awesome/font/fontawesome-webfont.svg

This file was deleted.

Binary file removed main/css/font_awesome/font/fontawesome-webfont.ttf
Binary file not shown.
Binary file removed main/css/font_awesome/font/fontawesome-webfont.woff
Binary file not shown.
6 changes: 3 additions & 3 deletions main/social/search.php
Expand Up @@ -185,18 +185,18 @@ function send_invitation_to_user(user_id) {
$results .= '<ul class="thumbnails">';
foreach ($users as $user) {

$send_inv = '<button class="btn btn-mini disabled "><i class="icon-user"></i> '.get_lang('SendInvitation').'</button><br /><br />';
$send_inv = '<button class="btn btn-mini disabled "><i class="fa fa-user"></i> '.get_lang('SendInvitation').'</button><br /><br />';
$relation_type = intval(SocialManager::get_relation_between_contacts(api_get_user_id(), $user['user_id']));
$user_info = api_get_user_info($user['user_id'], true);
$url = api_get_path(WEB_PATH).'main/social/profile.php?u='.$user['user_id'];

// Show send invitation icon if they are not friends yet
if ($relation_type != 3 && $relation_type != 4 && $user['user_id'] != api_get_user_id()) {
$send_inv = '<a href="javascript:void(0);" onclick="javascript:send_invitation_to_user(\''.$user['user_id'].'\');"/>
<button class="btn btn-mini"><i class="icon-user"></i> '.get_lang('SendInvitation').'</button></a><br /><br />';
<button class="btn btn-mini"><i class="fa fa-user"></i> '.get_lang('SendInvitation').'</button></a><br /><br />';
}
$send_msg = '<a href="javascript:void(0);" onclick="javascript:send_message_to_user(\''.$user['user_id'].'\');"/>
<button class="btn btn-mini"><i class="icon-envelope"></i> '.get_lang('SendMessage').'</button></a>';
<button class="btn btn-mini"><i class="fa fa-envelope"></i> '.get_lang('SendMessage').'</button></a>';
if (empty($user['picture_uri'])) {
$picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown.jpg';
$img = '<img src="'.$picture['file'].'">';
Expand Down

0 comments on commit abb37d2

Please sign in to comment.