diff options
| author | Phil Hughes <me@iamphill.com> | 2018-04-27 10:19:40 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-04-27 10:19:40 +0100 |
| commit | 6a651eb721dc421297c5f52c937d25faa139bc13 (patch) | |
| tree | e49cd8968864bf95f23ba7dbea0be4f406483c92 /app/assets/stylesheets/framework | |
| parent | 26c241d955ec0528b202792b0cb1848e9fe07691 (diff) | |
| parent | a8cb4322a07c2e167d866ed6d106f63c80c3343c (diff) | |
| download | gitlab-ce-6a651eb721dc421297c5f52c937d25faa139bc13.tar.gz | |
Merge branch 'master' into 44846-improve-web-ide-left-panel-and-modes
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/secondary_navigation_elements.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/wells.scss | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/secondary_navigation_elements.scss b/app/assets/stylesheets/framework/secondary_navigation_elements.scss index 17c31d6b184..66dbe403385 100644 --- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss +++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss @@ -241,8 +241,6 @@ } .scrolling-tabs-container { - position: relative; - .merge-request-tabs-container & { overflow: hidden; } @@ -272,8 +270,6 @@ } .inner-page-scroll-tabs { - position: relative; - .fade-right { @include fade(left, $white-light); right: 0; diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss index 2f3a80daa90..3fa7a260017 100644 --- a/app/assets/stylesheets/framework/wells.scss +++ b/app/assets/stylesheets/framework/wells.scss @@ -19,6 +19,7 @@ .fork-svg { margin-right: 4px; + vertical-align: bottom; } } |