diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-11 21:41:15 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-11 21:41:15 +0300 |
| commit | 2d00ad4868c21aef068232a79495f85e8f50d59b (patch) | |
| tree | 52de828f5f8d4ec78db4887b83e8230bde0e1280 /app/assets/stylesheets/pages | |
| parent | 86ae677e5f2ac82c1ebed0ff5ee20ef944f9459b (diff) | |
| parent | e0172564c219b6c0d858d4c803d792b99c7f86a0 (diff) | |
Merge branch '35724-animate-sidebar' into 'master'
Animate contextual sidebar; change class names for easier readability
Closes #35724
See merge request gitlab-org/gitlab-ce!15797
Diffstat (limited to 'app/assets/stylesheets/pages')
| -rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 3683afa07de..862ea379cbc 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -57,7 +57,7 @@ position: relative; @media (min-width: $screen-sm-min) { - transition: width $right-sidebar-transition-duration; + transition: width $sidebar-transition-duration; width: 100%; &.is-compact { @@ -453,8 +453,8 @@ .right-sidebar.right-sidebar-expanded { &.boards-sidebar-slide-enter-active, &.boards-sidebar-slide-leave-active { - transition: width $right-sidebar-transition-duration, - padding $right-sidebar-transition-duration; + transition: width $sidebar-transition-duration, + padding $sidebar-transition-duration; } &.boards-sidebar-slide-enter, diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 11ee1232bfe..32f2fa88236 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -126,7 +126,7 @@ top: $header-height; bottom: 0; right: 0; - transition: width $right-sidebar-transition-duration; + transition: width $sidebar-transition-duration; background: $gray-light; z-index: 200; overflow: hidden; |