diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-27 16:27:11 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-27 16:27:11 +0200 |
| commit | f248e4f57a5f7c22e629668aa74f5fba5a270805 (patch) | |
| tree | 6f9875327ddedd6b5ec17a7439eb2fd0aeef18ed | |
| parent | eb7cf9ba8222ba4d55b234ffe3b1a14197b0a3b9 (diff) | |
| parent | 29d400ba0d67b282144e04610ab23f45b21fcc41 (diff) | |
| download | gitlab-ce-f248e4f57a5f7c22e629668aa74f5fba5a270805.tar.gz | |
Merge pull request #6359 from jasonblanchard/comment-attachment-filename
Fixed attachment identifier displaying underneath note text
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/notes.scss | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 594ddf3f1ce..17df31affa1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,6 +36,7 @@ v 6.6.0 - Restyle Issue#show page and MR#show page - Ability to filter by multiple labels for Issues page - Rails version to 4.0.3 + - Fixed attachment identifier displaying underneath note text (Jason Blanchard) v 6.5.1 - Fix branch selectbox when create merge request from fork diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index 651b39753e3..8a38cd5a939 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -87,7 +87,6 @@ ul.notes { } .attachment { font-size: 14px; - margin-top: -20px; } .note-body { @include md-typography; @@ -305,6 +304,7 @@ ul.notes { @extend .col-md-4; @extend .thumbnail; margin-left: 45px; + float: none; } |