moved chat into account dropdown; removed fa icons in dropdown

main
psychobunny 9 years ago
parent 0271f846c7
commit 6cefddf86e

@ -51,6 +51,22 @@
top: 17px;
right: -3px;
}
.chat, .follow {
position: absolute;
width: 30px;
height: 30px;
}
.chat {
left: -1px;
bottom: 1px;
}
.follow {
right: 1px;
bottom: 1px;
}
}
&:hover {

@ -9,16 +9,15 @@
</span>
<!-- IF !isSelf -->
<br/>
<!-- IF !config.disableChat -->
<a id="chat-btn" href="#" class="btn btn-primary btn-sm">[[user:chat]]</a>
<!-- ENDIF !config.disableChat -->
<a id="follow-btn" href="#" class="btn btn-success btn-sm <!-- IF isFollowing -->hide<!-- ENDIF isFollowing -->">[[user:follow]]</a>
<a id="unfollow-btn" href="#" class="btn btn-warning btn-sm <!-- IF !isFollowing -->hide<!-- ENDIF !isFollowing -->">[[user:unfollow]]</a>
<!-- IF isFollowing -->
<a component="account/unfollow" href="#" class="btn btn-warning btn-sm">[[user:unfollow]]</a>
<!-- ELSE -->
<a component="account/follow" href="#" class="btn btn-success btn-sm">[[user:follow]]</a>
<!-- ENDIF isFollowing -->
<!-- ENDIF !isSelf -->
<!-- IF !isSelf -->
<!-- IF isAdmin -->
<br/><br/>
<a id="banAccountBtn" href="#" class="btn btn-danger btn-sm <!-- IF banned -->hide<!-- ENDIF banned -->">[[user:ban_account]]</a>
<a id="unbanAccountBtn" href="#" class="btn btn-danger btn-sm <!-- IF !banned -->hide<!-- ENDIF !banned -->">[[user:unban_account]]</a>
<a id="deleteAccountBtn" href="#" class="btn btn-danger btn-sm">[[user:delete_account]]</a><br/><br/>

@ -3,23 +3,31 @@
<i class="fa fa-ellipsis-v"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right">
<!-- IF !isSelf -->
<!-- IF !config.disableChat -->
<li>
<a href="{config.relative_path}/user/{userslug}" class="inline-block" id="profile"><i class="fa fa-user"></i> [[user:profile]]</a>
<a component="account/chat" href="#">[[user:chat_with, {username}]]</a>
</li>
<li class="divider"></li>
<!-- ENDIF !config.disableChat -->
<!-- ENDIF !isSelf -->
<li>
<a href="{config.relative_path}/user/{userslug}" class="inline-block" id="profile">[[user:profile]]</a>
</li>
<!-- IF showHidden -->
<li><a href="{config.relative_path}/user/{userslug}/settings"><i class="fa fa-gear"></i> [[user:settings]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/edit"><i class="fa fa-pencil-square-o"></i> [[user:edit]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/settings">[[user:settings]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/edit">[[user:edit]]</a></li>
<!-- ENDIF showHidden -->
<li class="divider"></li>
<li><a href="{config.relative_path}/user/{userslug}/following"><i class="fa fa-fw fa-users"></i> [[user:following]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/followers"><i class="fa fa-fw fa-users"></i> [[user:followers]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/following">[[user:following]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/followers">[[user:followers]]</a></li>
<li class="divider"></li>
<li><a href="{config.relative_path}/user/{userslug}/topics"><i class="fa fa-fw fa-book"></i> [[global:topics]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/posts"><i class="fa fa-fw fa-pencil"></i> [[global:posts]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/groups"><i class="fa fa-fw fa-users"></i> [[global:header.groups]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/topics">[[global:topics]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/posts">[[global:posts]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/groups">[[global:header.groups]]</a></li>
<!-- IF showHidden -->
<li><a href="{config.relative_path}/user/{userslug}/favourites"><i class="fa fa-fw fa-heart"></i> [[user:favourites]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/watched"><i class="fa fa-fw fa-eye"></i> [[user:watched]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/favourites">[[user:favourites]]</a></li>
<li><a href="{config.relative_path}/user/{userslug}/watched">[[user:watched]]</a></li>
<!-- ENDIF showHidden -->
<!-- BEGIN profile_links -->
<li id="{profile_links.id}" class="plugin-link <!-- IF profile_links.public -->public<!-- ELSE -->private<!-- ENDIF profile_links.public -->"><a href="{config.relative_path}/user/{userslug}/{profile_links.route}"><i class="fa fa-fw {profile_links.icon}"></i> {profile_links.name}</a></li>

Loading…
Cancel
Save