Commit 64673acf authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'duduribeiro-fix_showing_overflow' into 'master'

Fix project sidebar overflow small screens

See merge request !1488
parents c5a16b8c e3a9bb80
......@@ -12,7 +12,7 @@ v 7.8.0
- View note image attachments in new tab when clicked instead of downloading them
- Improve sorting logic in UI and API. Explicitly define what sorting method is used by default
- Allow more variations for commit messages closing issues (Julien Bianchi and Hannes Rosenögger)
-
- Fix overflow at sidebar when have several itens
-
- Show tags in commit view (Hannes Rosenögger)
- Only count a user's vote once on a merge request or issue (Michael Clarke)
......
%ul.project-navigation.nav.nav-sidebar
- if @project_settings_nav
= nav_link do
= link_to project_path(@project), title: 'Back to project', class: "" do
%i.fa.fa-angle-left
%span
Back to project
= nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
= link_to edit_project_path(@project), title: 'Settings', class: "stat-tab tab no-highlight" do
%i.fa.fa-cogs
%span
Settings
%i.fa.fa-angle-down
= render 'projects/settings_nav'
- else
= nav_link(path: 'projects#show', html_options: {class: "home"}) do
= link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
%i.fa.fa-dashboard
......@@ -70,6 +87,3 @@
%span
Settings
%i.fa.fa-angle-down
- if @project_settings_nav
= render 'projects/settings_nav'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment