Merge branch 'master-lint' into 'master'

fix borderzero lint See merge request gitlab-org/gitlab-ce!15233

Merge branch 'master-lint' into 'master'
fix borderzero lint See merge request gitlab-org/gitlab-ce!15233
435fd9d0 · Stan Hu · df7eaa85 · 5427034d · 435fd9d0
Commit 435fd9d0 authored Nov 07, 2017 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/stylesheets/pages/note_form.scss app/assets/stylesheets/pages/note_form.scss +1 -1

No files found.
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -121,7 +121,7 @@
  }
  .disabled-comment {
-    border: none;
+    border: 0;
    border-radius: $label-border-radius;
    padding-top: $gl-vert-padding;
    padding-bottom: $gl-vert-padding;