diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-20 19:34:46 +0300 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-20 19:34:46 +0300 |
commit | 8612b0889482a184c366e0493ab8f17b6e324418 (patch) | |
tree | 14cd633c54391656efeb702e8d31f5c5c52d1f7b /app | |
parent | 70dc7e9a9959997b72219ab4b48046e347b00938 (diff) | |
parent | 7249f22c8a3b4235a915ca6250579e0fb2d3a5f4 (diff) |
Merge branch '37862-breadcrumbs-mobile' into 'master'
Fix mobile sidebar button to match height of desktop breadcrumbs
Closes #37862
See merge request gitlab-org/gitlab-ce!14282
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/new_nav.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/new_sidebar.scss | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss index 58e205537ef..8c5bafac637 100644 --- a/app/assets/stylesheets/new_nav.scss +++ b/app/assets/stylesheets/new_nav.scss @@ -375,8 +375,6 @@ header.navbar-gitlab-new { display: flex; width: 100%; position: relative; - padding-top: $gl-padding; - padding-bottom: $gl-padding; align-items: center; border-bottom: 1px solid $border-color; } @@ -388,6 +386,11 @@ header.navbar-gitlab-new { align-self: center; color: $gl-text-color-secondary; + @media (max-width: $screen-xs-max) { + padding-left: 17px; + border-left: 1px solid $gl-text-color-quaternary; + } + .avatar-tile { margin-right: 4px; border: 1px solid $border-color; diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss index 4d5e3d1eceb..9c404b7e542 100644 --- a/app/assets/stylesheets/new_sidebar.scss +++ b/app/assets/stylesheets/new_sidebar.scss @@ -445,9 +445,8 @@ $new-sidebar-collapsed-width: 50px; background-color: transparent; border: 0; padding: 6px 16px; - margin: 0 16px 0 -15px; + margin: 0 0 0 -15px; height: 46px; - border-right: 1px solid $gl-text-color-quaternary; i { font-size: 20px; @@ -455,7 +454,12 @@ $new-sidebar-collapsed-width: 50px; } @media (max-width: $screen-xs-max) { - display: inline-block; + display: flex; + align-items: center; + + i { + font-size: 18px; + } } } |