Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-11-07 02:03:31 +0300
committerEric Eastwood <contact@ericeastwood.com>2017-11-07 02:03:31 +0300
commita46d32412ec93be2d6d10bd4bcbdd23b69d31865 (patch)
treeb017b0a0ff5628c11a42cf5c853414b46d77be10 /app/assets/stylesheets/framework/highlight.scss
parentcb7d63f90753617920cc6f9168a48dc998dc9ee4 (diff)
parent243530360edac31f309bd3706b2d5117f6d526ad (diff)
Merge branch 'master' into 38464-k8s-apps
Conflicts: db/schema.rb
Diffstat (limited to 'app/assets/stylesheets/framework/highlight.scss')
-rw-r--r--app/assets/stylesheets/framework/highlight.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/highlight.scss b/app/assets/stylesheets/framework/highlight.scss
index c63114f85b4..813a1711ea2 100644
--- a/app/assets/stylesheets/framework/highlight.scss
+++ b/app/assets/stylesheets/framework/highlight.scss
@@ -1,5 +1,5 @@
.file-content.code {
- border: none;
+ border: 0;
box-shadow: none;
margin: 0;
padding: 0;
@@ -7,7 +7,7 @@
pre {
padding: 10px 0;
- border: none;
+ border: 0;
border-radius: 0;
font-family: $monospace_font;
font-size: $code_font_size;