diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-05 09:15:08 +0000 |
---|---|---|
committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-05 11:23:36 +0200 |
commit | 6d6ba149451de0390e27b6ad287b68fece67e15e (patch) | |
tree | c358f4347d3c94340439b54d70a128b83262f916 /app | |
parent | dcbdfe7ac7106dca801bf08881d768f543f57390 (diff) | |
download | gitlab-ce-6d6ba149451de0390e27b6ad287b68fece67e15e.tar.gz |
Merge branch 'fix-jobs-log' into 'master'
Fix jobs log background color
Closes #47261
See merge request gitlab-org/gitlab-ce!19411
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index e24f8b1d4e8..c83144eb1ef 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -63,6 +63,20 @@ code { padding: 2px 4px; background-color: $red-100; border-radius: 3px; + + .code & { + background-color: inherit; + padding: unset; + } + + .build-trace & { + background-color: inherit; + padding: inherit; + } +} + +.code { + padding: 9.5px; } table { |