lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Desgin for Manage Users Tabs (#1777) 

* Update _subtitle.html.erb

* Update _manage_users_tags.html.erb

* Update admins.scss

* Update _primary_themes.scss

* Update _manage_users_tags.html.erb
This commit is contained in:
MrKeksi 2020-06-26 19:36:38 +02:00 committed by GitHub
parent 811a0d3920
commit 3ac85d97d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/admins.scss
View File

@ -84,10 +84,8 @@
color: white !important;
}
.manage-users-tab {
&:hover {
cursor: pointer;
}
#manage-users-nav.nav-tabs .nav-item {
margin-bottom: -1px;
}
#merge-account-arrow {

27
app/views/admins/components/_manage_users_tags.html.erb
View File

@ -14,20 +14,25 @@
%>
<div class="form-group mt-n3">
<div class="row">
<div class="col-12 tags">
<span id="active" class="btn btn-sm tag manage-users-tab <%= 'selected' if @tab == 'active' %>">
<nav class="row m-0">
<div class="nav col nav-tabs m-0 p-0" id="manage-users-nav" role="tablist" style="justify-content: space-around;">
<a class="nav-item p-3 nav-link <%= 'active' if @tab == 'active' %>" id="Active" href="?tab=active" role="tab" aria-selected="true"><i class="fas mr-3 fa-users"></i>
<%= t("roles.active") %>
</span>
<span id="pending" class="btn btn-sm tag manage-users-tab <%= 'selected' if @tab == 'pending' %>">
</a>
<a class="nav-item p-3 nav-link <%= 'active' if @tab == 'pending' %>" id="Pending" href="?tab=pending" role="tab" aria-selected="false"><i class="fas mr-3 fa-user-clock"></i>
<%= t("roles.pending") %>
</span>
<span id="denied" class="btn btn-sm tag manage-users-tab <%= 'selected' if @tab == 'denied' %>">
</a>
<a class="nav-item p-3 nav-link <%= 'active' if @tab == 'denied' %>" id="Denied" href="?tab=denied" role="tab" aria-selected="false"><i class="fas mr-3 fa-user-times"></i>
<%= t("roles.banned") %>
</span>
<span id="deleted" class="btn btn-sm tag manage-users-tab <%= 'selected' if @tab == 'deleted' %>">
</a>
<a class="nav-item p-3 nav-link <%= 'active' if @tab == 'deleted' %>" id="Deleted" href="?tab=deleted" role="tab" aria-selected="false"><i class="far mr-2 fa-trash-alt"></i>
<%= t("roles.deleted") %>
</span>
</a>
<% if admin_invite_registration %>
<%= link_to "#inviteModal", :class => "nav-item p-3 btn-primary", "id": "invite-user", "style": "margin-left: auto;", "data-toggle": "modal" do %>
<%= t("administrator.users.invite") %><i class="fas fa-paper-plane ml-3"></i>
<% end %>
<% end %>
</div>
</div>
</nav>
</div>

8
app/views/shared/components/_subtitle.html.erb
View File

@ -20,14 +20,6 @@
</div>
<div class="col-md-6 mb-4">
<% if admin_invite_registration %>
<div id="invite-user" class="d-inline-block float-right ml-3">
<%= link_to "#inviteModal", :class => "btn btn-primary", "data-toggle": "modal" do %>
<%= t("administrator.users.invite") %> <i class="fas fa-paper-plane ml-1"></i>
<% end %>
</div>
<% end %>
<div id="search-bar" class="d-inline-block float-right">
<div class="input-group">
<input id="search-input" type="text" class="form-control" placeholder="<%= t("settings.search") %>..." value="<%= @search %>">

8
lib/assets/_primary_themes.scss
View File

@ -80,6 +80,14 @@ a {
}
}
.nav-tabs .nav-link:not(.active){
color: #9aa0ac !important;
&:hover:not(.disabled) {
border-color: $primary-color;
color: $primary-color !important;
}
}
.dropdown-item {
color: #6e7687 !important;
&:hover {