scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 13:13:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2489 from aignatov-bio/ai-sci-4500-fix-team-dropdown

Browse source 
Fix team dropdown [SCI-4500]
This commit is contained in:
Miha Mencin 2020-03-25 12:55:46 +01:00 committed by GitHub
commit a2a5f8cfbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/navigation.js
View file

@ -90,11 +90,9 @@
ps = new PerfectScrollbar(teamContainter, { scrollYMarginOffset: 5 });
teamSwitch.click(() => {
dropDownHeight = dropDownMenu.height();
if (teamSwitch.find('.new-team').length === 0) {
teamSwitch.find('.edit_user').css('height', '100%');
}
dropDownMenu.css('height', (dropDownHeight + 'px'));
setTimeout(() => {
ps.update();
}, 0);

2
app/assets/stylesheets/themes/main_navigation.scss
View file

@ -311,8 +311,10 @@
.dropdown-menu {
border-radius: 0;
height: auto;
margin-top: 0;
max-height: calc(100vh - 50px);
overflow: scroll;
padding-bottom: 0;
padding-top: 0;
width: 100%;

2
app/views/shared/_navigation.html.erb
View file

@ -88,7 +88,7 @@
<% end %>
</div>
<% end %>
<% if current_user.teams.length > 1 && can_create_teams? %>
<% if can_create_teams? %>
<li class="new-team">
<%= link_to new_team_path do %>
<span class="fas fa-plus"></span>