Commit 037a9810 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'sidebar_state_toggle' into 'master'

Toggle sidebar button more obvious

The toggle is now at the top of the sidebar because it is not noticeable
near the bottom. By placing it at the top, users will immediately know that
they can have more space if they desire versus on the bottom, they will have
to search for it and that's not desired.

Fixes #2044

See merge request !1579
parents 75048fcd 5b6d6bbc
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
width: $sidebar_width; width: $sidebar_width;
.nav-sidebar { .nav-sidebar {
margin-top: 20px; margin-top: 29px;
position: fixed; position: fixed;
top: 45px; top: 45px;
width: $sidebar_width; width: $sidebar_width;
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
width: 52px; width: 52px;
.nav-sidebar { .nav-sidebar {
margin-top: 20px; margin-top: 29px;
position: fixed; position: fixed;
top: 45px; top: 45px;
width: 52px; width: 52px;
...@@ -144,14 +144,22 @@ ...@@ -144,14 +144,22 @@
} }
} }
} }
.collapse-nav a {
left: 0px;
padding: 5px 23px 3px 22px;
}
} }
} }
.collapse-nav a { .collapse-nav a {
position: fixed; position: fixed;
bottom: 15px; top: 47px;
padding: 10px; padding: 5px 13px 3px 13px;
background: #DDD; left: 197px;
background: #EEE;
color: black;
border: 1px solid rgba(0,0,0,0.035);
} }
@media (max-width: $screen-md-max) { @media (max-width: $screen-md-max) {
......
- if nav_menu_collapsed? - if nav_menu_collapsed?
= link_to icon('angle-right'), '#', class: 'toggle-nav-collapse' = link_to icon('angle-right'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
- else - else
= link_to icon('angle-left'), '#', class: 'toggle-nav-collapse' = link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- if @project_settings_nav - if @project_settings_nav
= nav_link do = nav_link do
= link_to namespace_project_path(@project.namespace, @project), title: 'Back to project', class: "" do = link_to namespace_project_path(@project.namespace, @project), title: 'Back to project', class: "" do
%i.fa.fa-angle-left %i.fa.fa-caret-square-o-left
%span %span
Back to project Back to project
......
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