diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 21:09:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 21:09:11 +0000 |
| commit | 93d7441cc98c1db55797a2181a3d9f4b3d26d82c (patch) | |
| tree | 72a7da7027a656239c2a40cfcef1db58238a2247 /app | |
| parent | 6b8d671de726534a03c18e025a586e1bc9c04a4f (diff) | |
| download | gitlab-ce-93d7441cc98c1db55797a2181a3d9f4b3d26d82c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/filters.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/page_bundles/ide.scss | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index 4b45a169a31..e151fff7eb3 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -56,6 +56,7 @@ padding-left: 12px; position: relative; margin-bottom: 0; + width: 1px; } .input-token { diff --git a/app/assets/stylesheets/page_bundles/ide.scss b/app/assets/stylesheets/page_bundles/ide.scss index 9c64714e5dd..4b838b1383e 100644 --- a/app/assets/stylesheets/page_bundles/ide.scss +++ b/app/assets/stylesheets/page_bundles/ide.scss @@ -75,7 +75,7 @@ $ide-commit-header-height: 48px; .multi-file-tabs { display: flex; - background-color: $white-normal; + background-color: $gray-light; box-shadow: inset 0 -1px $white-dark; > ul { |