diff options
| author | Sabba Petri <sabbap@gmail.com> | 2015-02-23 14:27:52 -0800 |
|---|---|---|
| committer | Sabba Petri <sabbap@gmail.com> | 2015-02-23 14:27:52 -0800 |
| commit | b3fd0ca04d498504e93894378be98dc1bda7e259 (patch) | |
| tree | 38b8c39877ec13c166fdaffc52f189c818180174 | |
| parent | bb2358379e347de9c6f9a0b521d2f8599f636881 (diff) | |
| download | gitlab-ce-b3fd0ca04d498504e93894378be98dc1bda7e259.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/sections/nav_sidebar.scss | 18 | ||||
| -rw-r--r-- | app/views/layouts/_collapse_button.html.haml | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/app/assets/stylesheets/sections/nav_sidebar.scss b/app/assets/stylesheets/sections/nav_sidebar.scss index 17923ca499b..8841068b6a6 100644 --- a/app/assets/stylesheets/sections/nav_sidebar.scss +++ b/app/assets/stylesheets/sections/nav_sidebar.scss @@ -108,7 +108,7 @@ width: $sidebar_width; .nav-sidebar { - margin-top: 20px; + margin-top: 29px; position: fixed; top: 45px; width: $sidebar_width; @@ -127,7 +127,7 @@ width: 52px; .nav-sidebar { - margin-top: 20px; + margin-top: 29px; position: fixed; top: 45px; width: 52px; @@ -144,14 +144,22 @@ } } } + + .collapse-nav a { + left: 0px; + padding: 5px 23px 3px 22px; + } } } .collapse-nav a { position: fixed; - bottom: 15px; - padding: 10px; - background: #DDD; + top: 47px; + padding: 5px 13px 3px 13px; + left: 197px; + background: #EEE; + color: black; + border: 1px solid rgba(0,0,0,0.035); } @media (max-width: $screen-md-max) { diff --git a/app/views/layouts/_collapse_button.html.haml b/app/views/layouts/_collapse_button.html.haml index b3b338b55bb..2ed51d87ca1 100644 --- a/app/views/layouts/_collapse_button.html.haml +++ b/app/views/layouts/_collapse_button.html.haml @@ -1,4 +1,4 @@ - 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 - = link_to icon('angle-left'), '#', class: 'toggle-nav-collapse' + = link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Open/Close" |