summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-06-05 09:15:08 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-06-05 09:15:08 +0000
commit5f475dfb52e944167c198e9a4b97c3231959a875 (patch)
tree1b1fc666828b4eaaaae8a0a2a3138bd72eb46fce
parent8554fac39cc5ca35ac75b6ec9b2cc5699a9fe30b (diff)
parent2eb4e772735a53d4cd95654211928291474acbb7 (diff)
downloadgitlab-ce-5f475dfb52e944167c198e9a4b97c3231959a875.tar.gz
Merge branch 'fix-jobs-log' into 'master'
Fix jobs log background color Closes #47261 See merge request gitlab-org/gitlab-ce!19411
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 5cf3bb4ae09..d5679177f8f 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -69,6 +69,11 @@ code {
background-color: inherit;
padding: unset;
}
+
+ .build-trace & {
+ background-color: inherit;
+ padding: inherit;
+ }
}
.code {