summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/nav.scss
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-09 17:23:27 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-10 12:01:51 -0500
commitade0a4af8b85c16f6b36bee7216a3d29c4b4be0c (patch)
tree1505b85acec1085f7173a932cd5f14cec1fe6862 /app/assets/stylesheets/framework/nav.scss
parenta1fbdbb6b106bcf6a959eb8f9a2a89dec6a15c9c (diff)
downloadgitlab-ce-ade0a4af8b85c16f6b36bee7216a3d29c4b4be0c.tar.gz
Fix logo at all screen widths, update sidebar text
Diffstat (limited to 'app/assets/stylesheets/framework/nav.scss')
-rw-r--r--app/assets/stylesheets/framework/nav.scss19
1 files changed, 19 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 8982eaa6833..75f44d81614 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -350,6 +350,8 @@
}
.nav-control {
+ padding-left: 0;
+ transition-duration: .3s;
.fade-right {
@media (min-width: $screen-xs-max) {
@@ -362,6 +364,23 @@
}
}
+.page-sidebar-collapsed {
+
+ .nav-control {
+ @media (min-width: $screen-md-min) {
+ padding-left: 32px;
+ transition-duration: .3s;
+ }
+ }
+
+ .layout-nav {
+
+ @media (max-width: $screen-sm-min) {
+ padding-left: 0;
+ }
+ }
+}
+
.scrolling-tabs-container {
position: relative;