summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/buttons.scss
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-11-06 17:03:31 -0600
committerEric Eastwood <contact@ericeastwood.com>2017-11-06 17:03:31 -0600
commita46d32412ec93be2d6d10bd4bcbdd23b69d31865 (patch)
treeb017b0a0ff5628c11a42cf5c853414b46d77be10 /app/assets/stylesheets/framework/buttons.scss
parentcb7d63f90753617920cc6f9168a48dc998dc9ee4 (diff)
parent243530360edac31f309bd3706b2d5117f6d526ad (diff)
downloadgitlab-ce-a46d32412ec93be2d6d10bd4bcbdd23b69d31865.tar.gz
Merge branch 'master' into 38464-k8s-apps
Conflicts: db/schema.rb
Diffstat (limited to 'app/assets/stylesheets/framework/buttons.scss')
-rw-r--r--app/assets/stylesheets/framework/buttons.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 16373b14ff7..b2f26cf7159 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -305,7 +305,7 @@
}
.btn-clipboard {
- border: none;
+ border: 0;
padding: 0 5px;
}