diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-01-25 12:36:50 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-01-25 12:36:50 +0300 |
| commit | e055f7d3caa2b4ba9e9d752b9f846c1c9b674c44 (patch) | |
| tree | 18749697207c3d36aa7a80f2ce3f4d58e8fc250e /app/assets/stylesheets/pages/diff.scss | |
| parent | d42762ce2cea606d8a24b8246a7270ec253215f2 (diff) | |
| parent | f10d75ecf6eaa568fc46a36a965c1d654a8317ef (diff) | |
Merge branch 'diff-fix-folder-path-commas' into 'master'
Fixed diff tree folders being rendered incorrectly
See merge request gitlab-org/gitlab-ce!24635
Diffstat (limited to 'app/assets/stylesheets/pages/diff.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 43486fad633..02aac58a475 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -1029,7 +1029,7 @@ position: sticky; $top-pos: $header-height + $mr-tabs-height + $mr-version-controls-height + 10px; top: $header-height + $mr-tabs-height + $mr-version-controls-height + 10px; - max-height: calc(100vh - $top-pos); + max-height: calc(100vh - #{$top-pos}); padding-right: $gl-padding; .file-row { @@ -1040,7 +1040,7 @@ .with-performance-bar & { $performance-bar-top-pos: $performance-bar-height + $top-pos; top: $performance-bar-top-pos; - max-height: calc(100vh - $performance-bar-top-pos); + max-height: calc(100vh - #{$performance-bar-top-pos}); } } |