diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-26 15:54:57 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-26 15:54:57 +0000 |
| commit | dfccc8d7b2eae0d00b946302c07d25fa9cc0ff91 (patch) | |
| tree | 2be9864c173f4de788217225a9e4fe968d04ff67 | |
| parent | 9f79f845f7e9a7855f3ab359cf6dcf2daf8b8e71 (diff) | |
| parent | 2e221b8117fb98fc64d1ffb98196c77d4e172aa4 (diff) | |
| download | gitlab-ce-dfccc8d7b2eae0d00b946302c07d25fa9cc0ff91.tar.gz | |
Merge branch 'mobile-breadcrumbs-divider' into 'master'
Fix sidebar mobile toggle button border
See merge request gitlab-org/gitlab-ce!14502
| -rw-r--r-- | app/assets/stylesheets/framework/new-nav.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/new-sidebar.scss | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/new-nav.scss b/app/assets/stylesheets/framework/new-nav.scss index c3badec59c9..d4b3fb238d5 100644 --- a/app/assets/stylesheets/framework/new-nav.scss +++ b/app/assets/stylesheets/framework/new-nav.scss @@ -317,11 +317,6 @@ 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/framework/new-sidebar.scss b/app/assets/stylesheets/framework/new-sidebar.scss index 9c404b7e542..3f1cb97aebc 100644 --- a/app/assets/stylesheets/framework/new-sidebar.scss +++ b/app/assets/stylesheets/framework/new-sidebar.scss @@ -461,6 +461,13 @@ $new-sidebar-collapsed-width: 50px; font-size: 18px; } } + + @media (max-width: $screen-xs-max) { + + .breadcrumbs-links { + padding-left: 17px; + border-left: 1px solid $gl-text-color-quaternary; + } + } } @media (max-width: $screen-xs-max) { |