diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-07 16:41:58 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-07 16:44:32 -0700 |
| commit | e0172564c219b6c0d858d4c803d792b99c7f86a0 (patch) | |
| tree | d52b697341ae40ef41b3667082f6a1ebf1d3b8a8 | |
| parent | ee85ca735a3ceb94d53e1a4ced38a46621194639 (diff) | |
| download | gitlab-ce-35724-animate-sidebar.tar.gz | |
Fix transitions35724-animate-sidebar
| -rw-r--r-- | app/assets/stylesheets/framework/contextual-sidebar.scss | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/contextual-sidebar.scss b/app/assets/stylesheets/framework/contextual-sidebar.scss index 3c60b4c8b2e..26a2db99e0a 100644 --- a/app/assets/stylesheets/framework/contextual-sidebar.scss +++ b/app/assets/stylesheets/framework/contextual-sidebar.scss @@ -1,5 +1,5 @@ .page-with-contextual-sidebar { - transition: padding-left, $sidebar-transition-duration; + transition: padding-left $sidebar-transition-duration; @media (min-width: $screen-md-min) { padding-left: $contextual-sidebar-collapsed-width; @@ -32,7 +32,7 @@ width: $contextual-sidebar-width; a { - transition: padding, $sidebar-transition-duration; + transition: padding $sidebar-transition-duration; font-weight: $gl-font-weight-bold; display: flex; align-items: center; @@ -67,7 +67,7 @@ } .nav-sidebar { - transition: width, $sidebar-transition-duration; + transition: width $sidebar-transition-duration, left $sidebar-transition-duration; position: fixed; z-index: 400; width: $contextual-sidebar-width; @@ -128,10 +128,10 @@ white-space: nowrap; a { - transition: padding, $sidebar-transition-duration; + transition: padding $sidebar-transition-duration; display: flex; align-items: center; - padding: 12px 16px; + padding: 12px 15px; color: $gl-text-color-secondary; } @@ -291,7 +291,8 @@ > a { margin-left: 4px; - padding-left: 12px; + // Subtract width of left border on active element + padding-left: 11px; } .badge { @@ -316,7 +317,7 @@ .toggle-sidebar-button, .close-nav-button { width: $contextual-sidebar-width - 2px; - transition: width, $sidebar-transition-duration; + transition: width $sidebar-transition-duration; position: fixed; bottom: 0; padding: 16px; @@ -354,7 +355,7 @@ .sidebar-collapsed-desktop { .context-header { - height: 61px; + height: 60px; width: $contextual-sidebar-collapsed-width; a { @@ -362,10 +363,6 @@ } } - li a { - padding: 12px 15px; - } - .sidebar-top-level-items > li { &.active a { padding-left: 12px; |