diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-23 15:22:54 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-23 15:22:54 +0000 |
| commit | 4e290454106e39c3c9487c672d6ee1178dce1410 (patch) | |
| tree | 5bb7d99c06ffba76316cd2e793d556d846bc0bdb | |
| parent | 16a79f56b82137835798044818d30eb8b8ad5a7a (diff) | |
| parent | d0fc2fe2885f04e1bf564fc038133faa194a92d9 (diff) | |
| download | gitlab-ce-4e290454106e39c3c9487c672d6ee1178dce1410.tar.gz | |
Merge branch 'double-border-on-no-comments' into 'master'
border bottom for last comment fixes double line issue
Since image uploading isn't working atm. Will upload screenshots when it works again.
https://unsee.cc/mosapine/
Fixes #3955
See merge request !2175
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 18cfcc05e7b..d86259f93fb 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -79,7 +79,6 @@ padding: $gl-padding; margin-left: -$gl-padding; margin-right: -$gl-padding; - border-top: 1px solid $border-color; margin-bottom: -$gl-padding; } diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 4dff87abaa4..72b0ed29a69 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -128,7 +128,7 @@ ul.notes { } &:last-child { - border-bottom: none; + border-bottom: 1px solid $border-color; } } } |