diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-06 21:39:53 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-06 21:39:53 +0300 |
| commit | 9de635bd953518c19ceb18bb2156e26ba9e73924 (patch) | |
| tree | c7fc5877230e6ca062c421983c8c2b91584215d0 /app/assets/stylesheets/framework/header.scss | |
| parent | d035bdbe3c9aff1b139ed656a5c4507475820e9d (diff) | |
| parent | fb63796ed9b5062431ee40faf9c7652964b48112 (diff) | |
Merge branch '39757-border-zero-of-scss-lint' into 'master'
Enable BorderZero rule in scss-lint
Closes #39757
See merge request gitlab-org/gitlab-ce!15168
Diffstat (limited to 'app/assets/stylesheets/framework/header.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 62ba74ff582..1cdfa904374 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -10,7 +10,7 @@ z-index: 1000; margin-bottom: 0; min-height: $header-height; - border: none; + border: 0; border-bottom: 1px solid $border-color; position: fixed; top: 0; @@ -169,7 +169,7 @@ .navbar-collapse { flex: 0 0 auto; - border-top: none; + border-top: 0; padding: 0; @media (max-width: $screen-xs-max) { |