scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-05 20:54:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1224 from ZmagoD/zd_SCI_2429

Browse source 
fixes setting sidebar teams link[fixes SCI-2429]
This commit is contained in:
Luka Murn 2018-07-13 14:55:24 +02:00 • committed by GitHub
commit f23cc36803
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/themes/menu_bar.scss
View file

@ -73,3 +73,7 @@
width: auto;
}
}
.all-teams-navigation-link {
color: $color-white !important;
}

7
app/views/users/settings/_sidebar.html.erb
View file

@ -63,7 +63,12 @@
<li class="<%= 'active' if on_settings_team_page? %>" >
<span class="tree-link line-wrap no-indent">
<% if on_settings_team_page? %>
<span title="<%= t("users.settings.sidebar.teams") %>"><%= t("users.settings.sidebar.teams") %></span>
<span title="<%= t("users.settings.sidebar.teams") %>">
<%= link_to t("users.settings.sidebar.teams"),
teams_path,
data: { 'no-turbolink' => 'true' },
class: 'all-teams-navigation-link' %>
</span>
<% else %>
<%= link_to t("users.settings.sidebar.teams"),
teams_path,