summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/sections/nav_sidebar.scss18
-rw-r--r--app/views/layouts/_collapse_button.html.haml4
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"