summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-11 09:08:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-11 09:08:39 +0000
commit1078b7bf25c2cb6e03c57da9ae25b0512858556f (patch)
treea50fbfaddb22aca89055296c4c532c7ecb2b1ca0 /app/assets
parent55733b19c526145cceb120e8bb874d476a84383a (diff)
downloadgitlab-ce-1078b7bf25c2cb6e03c57da9ae25b0512858556f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/blocks.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 37cb2372b80..0e4080ce201 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -325,11 +325,11 @@
}
.btn {
- margin: $btn-side-margin 5px;
+ margin: $gl-padding-8 $gl-padding-4;
@include media-breakpoint-down(xs) {
width: 100%;
- margin: $btn-side-margin 0;
+ margin: $gl-padding-8 0;
}
}
}